diff --git a/BUILD.gn b/BUILD.gn
index fc61dce..fc06c82 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -251,6 +251,19 @@
     "//testing/gtest",
   ]
   configs += [ ":pdfium_core_config" ]
+
+  if (is_android) {
+    use_raw_android_executable = true
+  }
+
+  if (pdf_enable_v8) {
+    configs += [ "//v8:external_startup_data" ]
+    deps += [
+      "fxjs:unittests",
+      "//v8",
+    ]
+  }
+
   if (pdf_enable_xfa) {
     deps += [
       "fxbarcode:unittests",
@@ -263,22 +276,6 @@
       "xfa/fxfa/parser:unittests",
     ]
   }
-
-  # TODO(thestig): Should this be an embeddertest?
-  if (pdf_use_skia || pdf_use_skia_paths) {
-    sources += [ "core/fxge/skia/fx_skia_device_unittest.cpp" ]
-    deps += [ "//skia" ]
-  }
-  if (pdf_enable_v8) {
-    configs += [ "//v8:external_startup_data" ]
-    deps += [
-      "fxjs:unittests",
-      "//v8",
-    ]
-  }
-  if (is_android) {
-    use_raw_android_executable = true
-  }
 }
 
 test("pdfium_embeddertests") {
@@ -335,6 +332,11 @@
   include_dirs = [ "testing/gmock/include" ]
   configs += [ ":pdfium_core_config" ]
 
+  if (is_android) {
+    ignore_all_data_deps = true
+    use_raw_android_executable = true
+  }
+
   if (pdf_enable_v8) {
     sources += [
       "fxjs/cfxjs_engine_embeddertest.cpp",
@@ -345,6 +347,7 @@
     deps += [ "fxjs" ]
     configs += [ "//v8:external_startup_data" ]
   }
+
   if (pdf_enable_xfa) {
     sources += [
       "fxjs/cfxjse_formcalc_context_embeddertest.cpp",
@@ -354,9 +357,10 @@
       "xfa/fxfa/parser/cxfa_document_parser_embeddertest.cpp",
     ]
   }
-  if (is_android) {
-    ignore_all_data_deps = true
-    use_raw_android_executable = true
+
+  if (pdf_use_skia || pdf_use_skia_paths) {
+    sources += [ "core/fxge/skia/fx_skia_device_embeddertest.cpp" ]
+    deps += [ "//skia" ]
   }
 }
 
diff --git a/core/fxge/skia/fx_skia_device_unittest.cpp b/core/fxge/skia/fx_skia_device_embeddertest.cpp
similarity index 99%
rename from core/fxge/skia/fx_skia_device_unittest.cpp
rename to core/fxge/skia/fx_skia_device_embeddertest.cpp
index dec1e76..3965a11c 100644
--- a/core/fxge/skia/fx_skia_device_unittest.cpp
+++ b/core/fxge/skia/fx_skia_device_embeddertest.cpp
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxge/skia/fx_skia_device.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_font.h"
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
+#include "core/fxge/skia/fx_skia_device.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "public/fpdfview.h"
 #include "testing/gtest/include/gtest/gtest.h"