diff --git a/BUILD.gn b/BUILD.gn
index 8e7de612ed..d750fd0bf5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -42,7 +42,7 @@ devtools_test_files = [
   "front_end/cpu_profiler_test_runner/cpu_profiler_test_runner.js",
   "front_end/data_grid_test_runner/data_grid_test_runner.js",
   "front_end/data_grid_test_runner/module.json",
-  "front_end/device_mode_test_runner/DeviceModeTestRunner.js",
+  "front_end/device_mode_test_runner/device_mode_test_runner.js",
   "front_end/device_mode_test_runner/module.json",
   "front_end/elements_test_runner/EditDOMTestRunner.js",
   "front_end/elements_test_runner/ElementsPanelShadowSelectionOnRefreshTestRunner.js",
diff --git a/all_devtools_files.gni b/all_devtools_files.gni
index 168f2a9b71..ae1c2e564b 100644
--- a/all_devtools_files.gni
+++ b/all_devtools_files.gni
@@ -94,7 +94,7 @@ all_devtools_files = [
   "front_end/data_grid_test_runner/module.json",
   "front_end/data_grid/dataGrid.css",
   "front_end/data_grid/module.json",
-  "front_end/device_mode_test_runner/DeviceModeTestRunner.js",
+  "front_end/device_mode_test_runner/device_mode_test_runner.js",
   "front_end/device_mode_test_runner/module.json",
   "front_end/devices/module.json",
   "front_end/diff/module.json",
diff --git a/front_end/BUILD.gn b/front_end/BUILD.gn
index c06e289728..f7a6b77f41 100644
--- a/front_end/BUILD.gn
+++ b/front_end/BUILD.gn
@@ -112,6 +112,7 @@ group("legacy_test-resources") {
     "coverage_test_runner:bundle",
     "cpu_profiler_test_runner:bundle",
     "data_grid_test_runner:bundle",
+    "device_mode_test_runner:bundle",
   ]
 }
 
diff --git a/front_end/device_mode_test_runner/BUILD.gn b/front_end/device_mode_test_runner/BUILD.gn
new file mode 100644
index 0000000000..a8023cf919
--- /dev/null
+++ b/front_end/device_mode_test_runner/BUILD.gn
@@ -0,0 +1,9 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("../../scripts/build/ninja/copy.gni")
+
+copy_sources_to_resources("bundle") {
+  sources = [ "device_mode_test_runner.js" ]
+}
diff --git a/front_end/device_mode_test_runner/DeviceModeTestRunner.js b/front_end/device_mode_test_runner/device_mode_test_runner.js
similarity index 100%
rename from front_end/device_mode_test_runner/DeviceModeTestRunner.js
rename to front_end/device_mode_test_runner/device_mode_test_runner.js
diff --git a/front_end/device_mode_test_runner/module.json b/front_end/device_mode_test_runner/module.json
index d7377753d4..5abf142c4d 100644
--- a/front_end/device_mode_test_runner/module.json
+++ b/front_end/device_mode_test_runner/module.json
@@ -3,10 +3,10 @@
     "test_runner",
     "emulation"
   ],
-  "scripts": [
-    "DeviceModeTestRunner.js"
+  "modules": [
+    "device_mode_test_runner.js"
   ],
   "skip_compilation": [
-    "DeviceModeTestRunner.js"
+    "device_mode_test_runner.js"
   ]
 }