diff --git a/BUILD.gn b/BUILD.gn
index f0accf1..111c69e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -319,7 +319,6 @@
   deps = [
     ":pdfium",
     "core/fpdfapi/edit:embeddertests",
-    "core/fpdfapi/page:embeddertests",
     "core/fpdfapi/parser:embeddertests",
     "core/fpdfapi/render:embeddertests",
     "core/fxcodec:embeddertests",
diff --git a/core/fpdfapi/page/BUILD.gn b/core/fpdfapi/page/BUILD.gn
index 3778ff6..ab91ced 100644
--- a/core/fpdfapi/page/BUILD.gn
+++ b/core/fpdfapi/page/BUILD.gn
@@ -127,12 +127,3 @@
   ]
   pdfium_root_dir = "../../../"
 }
-
-pdfium_embeddertest_source_set("embeddertests") {
-  sources = [
-    "cpdf_docpagedata_embeddertest.cpp",
-    "cpdf_function_embeddertest.cpp",
-    "cpdf_stitchfunc_embeddertest.cpp",
-  ]
-  pdfium_root_dir = "../../../"
-}
diff --git a/core/fpdfapi/page/cpdf_docpagedata_embeddertest.cpp b/core/fpdfapi/page/cpdf_docpagedata_embeddertest.cpp
deleted file mode 100644
index e8bea02..0000000
--- a/core/fpdfapi/page/cpdf_docpagedata_embeddertest.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2018 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "testing/embedder_test.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-class CPDF_DocPageDataEmbedderTest : public EmbedderTest {};
-
-TEST_F(CPDF_DocPageDataEmbedderTest, Crasher_828206) {
-  EXPECT_TRUE(OpenDocument("bug_828206.pdf"));
-  FPDF_PAGE page = LoadPage(0);
-  ASSERT_TRUE(page);
-  RenderLoadedPage(page);
-  UnloadPage(page);
-}
-
-TEST_F(CPDF_DocPageDataEmbedderTest, BUG_925736) {
-  EXPECT_TRUE(OpenDocument("bug_925736.pdf"));
-  FPDF_PAGE page = LoadPage(0);
-  ASSERT_TRUE(page);
-  UnloadPage(page);
-}
diff --git a/core/fpdfapi/page/cpdf_function_embeddertest.cpp b/core/fpdfapi/page/cpdf_function_embeddertest.cpp
deleted file mode 100644
index f96c82f..0000000
--- a/core/fpdfapi/page/cpdf_function_embeddertest.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2018 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "testing/embedder_test.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-class CPDF_FunctionEmbedderTest : public EmbedderTest {};
-
-TEST_F(CPDF_FunctionEmbedderTest, Crasher_830221) {
-  EXPECT_TRUE(OpenDocument("bug_830221.pdf"));
-  FPDF_PAGE page = LoadPage(0);
-  ASSERT_TRUE(page);
-  RenderLoadedPage(page);
-  UnloadPage(page);
-}
diff --git a/core/fpdfapi/page/cpdf_stitchfunc_embeddertest.cpp b/core/fpdfapi/page/cpdf_stitchfunc_embeddertest.cpp
deleted file mode 100644
index fa85a4f..0000000
--- a/core/fpdfapi/page/cpdf_stitchfunc_embeddertest.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <memory>
-
-#include "public/cpp/fpdf_scopers.h"
-#include "testing/embedder_test.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-class FPDFPageFuncEmbedderTest : public EmbedderTest {};
-
-TEST_F(FPDFPageFuncEmbedderTest, Bug_551460) {
-  // Should not crash under ASan.
-  // Tests that the number of inputs is not simply calculated from the domain
-  // and trusted. The number of inputs has to be 1.
-  EXPECT_TRUE(OpenDocument("bug_551460.pdf"));
-  FPDF_PAGE page = LoadPage(0);
-  ASSERT_TRUE(page);
-  ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
-  CompareBitmap(bitmap.get(), 612, 792, "1940568c9ba33bac5d0b1ee9558c76b3");
-  UnloadPage(page);
-}
diff --git a/testing/resources/bug_551460.in b/testing/resources/pixel/bug_551460.in
similarity index 100%
rename from testing/resources/bug_551460.in
rename to testing/resources/pixel/bug_551460.in
diff --git a/testing/resources/pixel/bug_551460_expected.pdf.0.png b/testing/resources/pixel/bug_551460_expected.pdf.0.png
new file mode 100644
index 0000000..08c11b0
--- /dev/null
+++ b/testing/resources/pixel/bug_551460_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/bug_828206.pdf b/testing/resources/pixel/bug_828206.pdf
similarity index 100%
rename from testing/resources/bug_828206.pdf
rename to testing/resources/pixel/bug_828206.pdf
Binary files differ
diff --git a/testing/resources/pixel/bug_828206_expected.pdf.0.png b/testing/resources/pixel/bug_828206_expected.pdf.0.png
new file mode 100644
index 0000000..08c11b0
--- /dev/null
+++ b/testing/resources/pixel/bug_828206_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/bug_830221.pdf b/testing/resources/pixel/bug_830221.pdf
similarity index 100%
rename from testing/resources/bug_830221.pdf
rename to testing/resources/pixel/bug_830221.pdf
diff --git a/testing/resources/pixel/bug_830221_expected.pdf.0.png b/testing/resources/pixel/bug_830221_expected.pdf.0.png
new file mode 100644
index 0000000..08c11b0
--- /dev/null
+++ b/testing/resources/pixel/bug_830221_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/bug_925736.pdf b/testing/resources/pixel/bug_925736.pdf
similarity index 100%
rename from testing/resources/bug_925736.pdf
rename to testing/resources/pixel/bug_925736.pdf
Binary files differ
diff --git a/testing/resources/pixel/bug_925736_expected.pdf.0.png b/testing/resources/pixel/bug_925736_expected.pdf.0.png
new file mode 100644
index 0000000..223f650
--- /dev/null
+++ b/testing/resources/pixel/bug_925736_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_925736_expected_mac.pdf.0.png b/testing/resources/pixel/bug_925736_expected_mac.pdf.0.png
new file mode 100644
index 0000000..f71efde
--- /dev/null
+++ b/testing/resources/pixel/bug_925736_expected_mac.pdf.0.png
Binary files differ