diff --git a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
index 650c63a..a0b8ee1 100644
--- a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
@@ -318,7 +318,13 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFProgressiveRenderEmbedderTest, RenderTextWithColorScheme) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderTextWithColorScheme DISABLED_RenderTextWithColorScheme
+#else
+#define MAYBE_RenderTextWithColorScheme RenderTextWithColorScheme
+#endif
+TEST_F(FPDFProgressiveRenderEmbedderTest, MAYBE_RenderTextWithColorScheme) {
 // Test rendering of text with forced color scheme on.
 #if defined(OS_WIN)
   static constexpr char kMD5ContentWithText[] =
@@ -338,7 +344,13 @@
                                  kBlack, 200, 200, kMD5ContentWithText);
 }
 
-TEST_F(FPDFProgressiveRenderEmbedderTest, RenderPathWithColorScheme) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderPathWithColorScheme DISABLED_RenderPathWithColorScheme
+#else
+#define MAYBE_RenderPathWithColorScheme RenderPathWithColorScheme
+#endif
+TEST_F(FPDFProgressiveRenderEmbedderTest, MAYBE_RenderPathWithColorScheme) {
   // Test rendering of paths with forced color scheme on.
   static const char kMD5Rectangles[] = "249f59b0d066c4f6bd89782a80822219";
 
@@ -349,8 +361,16 @@
                                  kBlack, 200, 300, kMD5Rectangles);
 }
 
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderPathWithColorSchemeAndConvertFillToStroke \
+  DISABLED_RenderPathWithColorSchemeAndConvertFillToStroke
+#else
+#define MAYBE_RenderPathWithColorSchemeAndConvertFillToStroke \
+  RenderPathWithColorSchemeAndConvertFillToStroke
+#endif
 TEST_F(FPDFProgressiveRenderEmbedderTest,
-       RenderPathWithColorSchemeAndConvertFillToStroke) {
+       MAYBE_RenderPathWithColorSchemeAndConvertFillToStroke) {
   // Test rendering of paths with forced color scheme on and conversion from
   // fill to stroke enabled. The fill paths should be rendered as stroke.
   static const char kMD5Rectangles[] = "0ebcc11e617635eca1fa9ce475383a80";
@@ -363,7 +383,15 @@
                                  kMD5Rectangles);
 }
 
-TEST_F(FPDFProgressiveRenderEmbedderTest, RenderHighlightWithColorScheme) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderHighlightWithColorScheme \
+  DISABLED_RenderHighlightWithColorScheme
+#else
+#define MAYBE_RenderHighlightWithColorScheme RenderHighlightWithColorScheme
+#endif
+TEST_F(FPDFProgressiveRenderEmbedderTest,
+       MAYBE_RenderHighlightWithColorScheme) {
 // Test rendering of highlight with forced color scheme on.
 //
 // Note: The fill color rendered for highlight is different from the normal
@@ -384,8 +412,16 @@
                                  kBlue, 612, 792, kMD5ContentWithHighlightFill);
 }
 
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderHighlightWithColorSchemeAndConvertFillToStroke \
+  DISABLED_RenderHighlightWithColorSchemeAndConvertFillToStroke
+#else
+#define MAYBE_RenderHighlightWithColorSchemeAndConvertFillToStroke \
+  RenderHighlightWithColorSchemeAndConvertFillToStroke
+#endif
 TEST_F(FPDFProgressiveRenderEmbedderTest,
-       RenderHighlightWithColorSchemeAndConvertFillToStroke) {
+       MAYBE_RenderHighlightWithColorSchemeAndConvertFillToStroke) {
 // Test rendering of highlight with forced color and converting fill to
 // stroke. The highlight should be rendered as a stroke of the rect.
 //
@@ -408,7 +444,13 @@
       kBlue, 612, 792, kMD5ContentWithHighlight);
 }
 
-TEST_F(FPDFProgressiveRenderEmbedderTest, RenderInkWithColorScheme) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderInkWithColorScheme DISABLED_RenderInkWithColorScheme
+#else
+#define MAYBE_RenderInkWithColorScheme RenderInkWithColorScheme
+#endif
+TEST_F(FPDFProgressiveRenderEmbedderTest, MAYBE_RenderInkWithColorScheme) {
 // Test rendering of multiple ink with forced color scheme on.
 #if defined(OS_WIN)
   static constexpr char kMD5ContentWithInk[] =
@@ -425,7 +467,13 @@
                                  kBlack, 612, 792, kMD5ContentWithInk);
 }
 
-TEST_F(FPDFProgressiveRenderEmbedderTest, RenderStampWithColorScheme) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderStampWithColorScheme DISABLED_RenderStampWithColorScheme
+#else
+#define MAYBE_RenderStampWithColorScheme RenderStampWithColorScheme
+#endif
+TEST_F(FPDFProgressiveRenderEmbedderTest, MAYBE_RenderStampWithColorScheme) {
 // Test rendering of static annotation with forced color scheme on.
 #if defined(OS_WIN)
   static constexpr char kMD5ContentWithStamp[] =
@@ -445,7 +493,13 @@
                                  kWhite, 595, 842, kMD5ContentWithStamp);
 }
 
-TEST_F(FPDFProgressiveRenderEmbedderTest, RenderFormWithColorScheme) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderFormWithColorScheme DISABLED_RenderFormWithColorScheme
+#else
+#define MAYBE_RenderFormWithColorScheme RenderFormWithColorScheme
+#endif
+TEST_F(FPDFProgressiveRenderEmbedderTest, MAYBE_RenderFormWithColorScheme) {
   // Test rendering of form does not change with forced color scheme on.
   static constexpr char kMD5ContentWithForm[] =
       "080f7a4381606659301440e1b14dca35";
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index c673766..3155191 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -658,7 +658,13 @@
   CloseSavedDocument();
 }
 
-TEST_F(FPDFEditEmbedderTest, SetTextKeepClippingPath) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_SetTextKeepClippingPath DISABLED_SetTextKeepClippingPath
+#else
+#define MAYBE_SetTextKeepClippingPath SetTextKeepClippingPath
+#endif
+TEST_F(FPDFEditEmbedderTest, MAYBE_SetTextKeepClippingPath) {
   // Load document with some text, with parts clipped.
   ASSERT_TRUE(OpenDocument("bug_1558.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -3386,7 +3392,15 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbedderTest, GetRenderedBitmapHandlesSetMatrix) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_)
+#define MAYBE_GetRenderedBitmapHandlesSetMatrix \
+  DISABLED_GetRenderedBitmapHandlesSetMatrix
+#else
+#define MAYBE_GetRenderedBitmapHandlesSetMatrix \
+  GetRenderedBitmapHandlesSetMatrix
+#endif
+TEST_F(FPDFEditEmbedderTest, MAYBE_GetRenderedBitmapHandlesSetMatrix) {
   ASSERT_TRUE(OpenDocument("embedded_images.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -3443,7 +3457,14 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFEditEmbedderTest, GetRenderedBitmapHandlesSMask) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_)
+#define MAYBE_GetRenderedBitmapHandlesSMask \
+  DISABLED_GetRenderedBitmapHandlesSMask
+#else
+#define MAYBE_GetRenderedBitmapHandlesSMask GetRenderedBitmapHandlesSMask
+#endif
+TEST_F(FPDFEditEmbedderTest, MAYBE_GetRenderedBitmapHandlesSMask) {
   ASSERT_TRUE(OpenDocument("matte.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
diff --git a/fpdfsdk/fpdf_flatten_embeddertest.cpp b/fpdfsdk/fpdf_flatten_embeddertest.cpp
index 50db441..fd7c608 100644
--- a/fpdfsdk/fpdf_flatten_embeddertest.cpp
+++ b/fpdfsdk/fpdf_flatten_embeddertest.cpp
@@ -74,7 +74,13 @@
   VerifySavedDocument(100, 120, kBlankPageHash);
 }
 
-TEST_F(FPDFFlattenEmbedderTest, BUG_889099) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_BUG_889099 DISABLED_BUG_889099
+#else
+#define MAYBE_BUG_889099 BUG_889099
+#endif
+TEST_F(FPDFFlattenEmbedderTest, MAYBE_BUG_889099) {
 #if defined(OS_WIN)
   constexpr char kPageHash[] = "8c6e1dab0a15072f2c9c0ca240fdc739";
   constexpr char kFlattenedPageHash[] = "9fb932ce7f370c0e68eec0a5d4d76271";
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 6002917..f81f3c7 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -1238,7 +1238,14 @@
   }
 }
 
-TEST_F(FPDFViewEmbedderTest, RenderBug664284WithNoNativeText) {
+// TODO(crbug.com/pdfium/11): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_RenderBug664284WithNoNativeText \
+  DISABLED_RenderBug664284WithNoNativeText
+#else
+#define MAYBE_RenderBug664284WithNoNativeText RenderBug664284WithNoNativeText
+#endif
+TEST_F(FPDFViewEmbedderTest, MAYBE_RenderBug664284WithNoNativeText) {
 // FPDF_NO_NATIVETEXT flag only disables native text support on macOS, therefore
 // Windows and Linux rendering results remain the same as rendering with no
 // flags, while the macOS rendering result doesn't.