diff --git a/CHANGELOG.md b/CHANGELOG.md
index be61d30f45ec..0523414bd0c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Nothing yet!
+### Fixed
+
+- Temporarily disable optimize univeral defaults ([#6461](https://github.com/tailwindlabs/tailwindcss/pull/6461))
 
 ## [3.0.1] - 2021-12-10
 
diff --git a/src/featureFlags.js b/src/featureFlags.js
index 7e521f95bcf3..b978c2526d61 100644
--- a/src/featureFlags.js
+++ b/src/featureFlags.js
@@ -2,7 +2,11 @@ import chalk from 'chalk'
 import log from './util/log'
 
 let defaults = {
-  optimizeUniversalDefaults: true,
+  // TODO: Drop this once we can safely rely on optimizeUniversalDefaults being
+  // the default.
+  optimizeUniversalDefaults: process.env.NODE_ENV === 'test' ? true : false,
+
+  // optimizeUniversalDefaults: true
 }
 
 let featureFlags = {