diff --git a/tests/phpunit/tests/fonts/font-face/base.php b/tests/phpunit/tests/fonts/font-face/base.php
index 3b016557728a6..43c21ac3a89b3 100644
--- a/tests/phpunit/tests/fonts/font-face/base.php
+++ b/tests/phpunit/tests/fonts/font-face/base.php
@@ -69,6 +69,7 @@ public static function set_up_before_class() {
 	public static function tear_down_after_class() {
 		// Reset static flags.
 		self::$requires_switch_theme_fixtures = false;
+		self::$theme_root                     = null;
 
 		parent::tear_down_after_class();
 	}
diff --git a/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php b/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php
index 664404d552b45..2c35569b4d196 100644
--- a/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php
+++ b/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php
@@ -16,8 +16,9 @@ class Tests_Fonts_WpPrintFontFacesFromStyleVariations extends WP_Font_Face_UnitT
 	const FONTS_THEME = 'fonts-block-theme';
 
 	public static function set_up_before_class() {
-		parent::set_up_before_class();
 		self::$requires_switch_theme_fixtures = true;
+
+		parent::set_up_before_class();
 	}
 
 	/**