diff --git a/BUILD.gn b/BUILD.gn
index eb7872df01..3a134d872e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -27,57 +27,6 @@ group("all") {
   }
 }
 
-###############################################################################
-# Temporary Dawn end2end test target
-###############################################################################
-
-# It is not possible to move a target around with a proxy group without
-# breaking swarming tests. This is a temporary target that is a duplicate of
-# //src/tests:dawn_end2end_tests that's used temporarily so that we can land
-# the split of src/tests/BUILD.gn in a Chromium roll and switch which targets
-# the swarmed tests use.
-
-import("//testing/test.gni")
-
-test("dawn_end2end_tests") {
-  configs += [ "src/common:dawn_internal" ]
-
-  deps = [
-    "src/common",
-    "src/dawn:dawncpp",
-    "src/dawn:libdawn_proc",
-    "src/dawn_native",
-    "src/dawn_wire",
-    "src/tests:dawn_end2end_tests_sources",
-    "src/tests:dawn_white_box_tests_sources",
-    "src/tests:gmock_and_gtest",
-    "src/utils:dawn_utils",
-  ]
-
-  sources = [
-    "src/tests/DawnTest.cpp",
-    "src/tests/DawnTest.h",
-  ]
-
-  libs = []
-
-  # When building inside Chromium, use their gtest main function because it is
-  # needed to run in swarming correctly.
-  if (build_with_chromium) {
-    sources += [ "//gpu/dawn_end2end_tests_main.cc" ]
-  } else {
-    sources += [ "src/tests/End2EndTestsMain.cpp" ]
-  }
-
-  if (dawn_enable_opengl) {
-    deps += [ "src/utils:dawn_glfw" ]
-  }
-
-  if (is_chromeos) {
-    libs += [ "gbm" ]
-  }
-}
-
 ###############################################################################
 # Temporary groups
 ###############################################################################
@@ -93,7 +42,7 @@ group("dawn_unittests_temp_group") {
 group("dawn_end2end_tests_temp_group") {
   testonly = true
   public_deps = [
-    ":dawn_end2end_tests",
+    "src/tests:dawn_end2end_tests",
   ]
 }
 
diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index d5c8916778..ce36e25fd6 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -360,6 +360,7 @@ source_set("dawn_white_box_tests_sources") {
   libs = []
 }
 
+# Temporary target that will be removed once Chromium switches to using the non-_tmp version below
 test("dawn_end2end_tests_tmp") {
   configs += [ "${dawn_root}/src/common:dawn_internal" ]
 
@@ -399,6 +400,45 @@ test("dawn_end2end_tests_tmp") {
   }
 }
 
+test("dawn_end2end_tests") {
+  configs += [ "${dawn_root}/src/common:dawn_internal" ]
+
+  deps = [
+    ":dawn_end2end_tests_sources",
+    ":dawn_white_box_tests_sources",
+    ":gmock_and_gtest",
+    "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawncpp",
+    "${dawn_root}/src/dawn:libdawn_proc",
+    "${dawn_root}/src/dawn_native",
+    "${dawn_root}/src/dawn_wire",
+    "${dawn_root}/src/utils:dawn_utils",
+  ]
+
+  sources = [
+    "DawnTest.cpp",
+    "DawnTest.h",
+  ]
+
+  libs = []
+
+  # When building inside Chromium, use their gtest main function because it is
+  # needed to run in swarming correctly.
+  if (build_with_chromium) {
+    sources += [ "//gpu/dawn_end2end_tests_main.cc" ]
+  } else {
+    sources += [ "End2EndTestsMain.cpp" ]
+  }
+
+  if (dawn_enable_opengl) {
+    deps += [ "${dawn_root}/src/utils:dawn_glfw" ]
+  }
+
+  if (is_chromeos) {
+    libs += [ "gbm" ]
+  }
+}
+
 ###############################################################################
 # Dawn perf tests
 ###############################################################################