diff --git a/core/fxcodec/jbig2/jbig2_embeddertest.cpp b/core/fxcodec/jbig2/jbig2_embeddertest.cpp
index 8acd884..e2523fc 100644
--- a/core/fxcodec/jbig2/jbig2_embeddertest.cpp
+++ b/core/fxcodec/jbig2/jbig2_embeddertest.cpp
@@ -10,7 +10,13 @@
 
 class JBig2EmbedderTest : public EmbedderTest {};
 
-TEST_F(JBig2EmbedderTest, Bug_631912) {
+#if defined(_SKIA_SUPPORT_)
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#define MAYBE_Bug_631912 DISABLED_Bug_631912
+#else
+#define MAYBE_Bug_631912 Bug_631912
+#endif
+TEST_F(JBig2EmbedderTest, MAYBE_Bug_631912) {
   // Test jbig2 image in PDF file can be loaded successfully.
   // Should not crash.
   EXPECT_TRUE(OpenDocument("bug_631912.pdf"));
diff --git a/core/fxge/skia/fx_skia_device_embeddertest.cpp b/core/fxge/skia/fx_skia_device_embeddertest.cpp
index d506555..6631e4d 100644
--- a/core/fxge/skia/fx_skia_device_embeddertest.cpp
+++ b/core/fxge/skia/fx_skia_device_embeddertest.cpp
@@ -159,7 +159,8 @@
 }
 
 #ifdef _SKIA_SUPPORT_
-TEST(fxge, SkiaStateText) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+TEST(fxge, DISABLED_SkiaStateText) {
   Harness(&CommonTest,
           {State::Change::kNo, State::Save::kYes, State::Clip::kDifferentMatrix,
            State::Graphic::kText, 0xFF445566});