2 files changed, 12 insertions, 6 deletions
diff --git a/xfa/fde/css/cfde_cssdeclaration_unittest.cpp b/xfa/fde/css/cfde_cssdeclaration_unittest.cpp
index 48a3c72c39..80cd72c4d3 100644
--- a/xfa/fde/css/cfde_cssdeclaration_unittest.cpp
+++ b/xfa/fde/css/cfde_cssdeclaration_unittest.cpp
@@ -5,8 +5,11 @@
 #include "xfa/fde/css/cfde_cssdeclaration.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/test_support.h"
 
-TEST(CFDE_CSSDecalration, HexEncodingParsing) {
+class CFDE_CSSDecalrationTest : public pdfium::FPDF_Test {};
+
+TEST_F(CFDE_CSSDecalrationTest, HexEncodingParsing) {
   FX_ARGB color;
 
   // Length value invalid.
@@ -42,7 +45,7 @@ TEST(CFDE_CSSDecalration, HexEncodingParsing) {
   EXPECT_EQ(60, FXARGB_B(color));
 }
 
-TEST(CFDE_CSSDecalration, RGBEncodingParsing) {
+TEST_F(CFDE_CSSDecalrationTest, RGBEncodingParsing) {
   FX_ARGB color;
 
   // Invalid input for rgb() syntax.
diff --git a/xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp b/xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp
index 2864c842ad..077fb54e93 100644
--- a/xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp
+++ b/xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp
@@ -7,9 +7,12 @@
 #include "xfa/fde/css/cfde_cssvaluelistparser.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/test_support.h"
 #include "third_party/base/ptr_util.h"
 
-TEST(CFDE_CSSValueListParser, rgb_short) {
+class CFDE_CSSValueListParserTest : public pdfium::FPDF_Test {};
+
+TEST_F(CFDE_CSSValueListParserTest, rgb_short) {
   FDE_CSSPrimitiveType type;
   const wchar_t* start;
   int32_t len;
@@ -40,7 +43,7 @@ TEST(CFDE_CSSValueListParser, rgb_short) {
   EXPECT_FALSE(parser->NextValue(type, start, len));
 }
 
-TEST(CFDE_CSSValueListParser, number_parsing) {
+TEST_F(CFDE_CSSValueListParserTest, number_parsing) {
   FDE_CSSPrimitiveType type;
   const wchar_t* start;
   int32_t len;
@@ -82,7 +85,7 @@ TEST(CFDE_CSSValueListParser, number_parsing) {
   EXPECT_EQ(L"43a1.12.34", CFX_WideString(start, len));
 }
 
-TEST(CFDE_CSSValueListParser, string_parsing) {
+TEST_F(CFDE_CSSValueListParserTest, string_parsing) {
   FDE_CSSPrimitiveType type;
   const wchar_t* start;
   int32_t len;
@@ -105,7 +108,7 @@ TEST(CFDE_CSSValueListParser, string_parsing) {
   EXPECT_EQ(L"standalone", CFX_WideString(start, len));
 }
 
-TEST(CFDE_CSSValueListParser, multiparsing) {
+TEST_F(CFDE_CSSValueListParserTest, multiparsing) {
   FDE_CSSPrimitiveType type;
   const wchar_t* start;
   int32_t len;