diff --git a/packages/postcss-discard-empty/src/index.js b/packages/postcss-discard-empty/src/index.js
index 0fac0c453..77f324943 100644
--- a/packages/postcss-discard-empty/src/index.js
+++ b/packages/postcss-discard-empty/src/index.js
@@ -19,7 +19,7 @@ function discardAndReport(css, result) {
     }
 
     if (
-      (type === 'decl' && !node.value) ||
+      (type === 'decl' && !node.value && !node.prop.startsWith('--')) ||
       (type === 'rule' && !node.selector) ||
       (sub && !sub.length) ||
       (type === 'atrule' &&
diff --git a/packages/postcss-discard-empty/test/index.js b/packages/postcss-discard-empty/test/index.js
index e776e4a0b..c5e736114 100644
--- a/packages/postcss-discard-empty/test/index.js
+++ b/packages/postcss-discard-empty/test/index.js
@@ -85,6 +85,11 @@ test(
   passthroughCSS('h1{/*comment*/}')
 );
 
+test(
+  'should preserve empty custom properties',
+  passthroughCSS('*{--tw-shadow:; --something-else: ;}')
+);
+
 test(
   'should report removed selectors',
   testRemovals('h1{}.hot{}.a.b{}{}@media screen, print{h1,h2{}}', '', [
diff --git a/packages/postcss-minify-params/src/index.js b/packages/postcss-minify-params/src/index.js
index 5a265c5b7..228aa09a4 100644
--- a/packages/postcss-minify-params/src/index.js
+++ b/packages/postcss-minify-params/src/index.js
@@ -69,11 +69,21 @@ function transform(legacy, rule) {
   const params = valueParser(rule.params);
 
   params.walk((node, index) => {
-    if (node.type === 'div' || node.type === 'function') {
+    if (node.type === 'div') {
       node.before = node.after = '';
-
+    } else if (node.type === 'function') {
+      node.before = '';
+      if (
+        node.nodes[0] &&
+        node.nodes[0].type === 'word' &&
+        node.nodes[0].value.startsWith('--') &&
+        node.nodes[2] === undefined
+      ) {
+        node.after = ' ';
+      } else {
+        node.after = '';
+      }
       if (
-        node.type === 'function' &&
         node.nodes[4] &&
         node.nodes[0].value.toLowerCase().indexOf('-aspect-ratio') === 3
       ) {
diff --git a/packages/postcss-minify-params/test/index.js b/packages/postcss-minify-params/test/index.js
index d18581066..063fba7c0 100644
--- a/packages/postcss-minify-params/test/index.js
+++ b/packages/postcss-minify-params/test/index.js
@@ -183,6 +183,22 @@ test(
   )
 );
 
+test(
+  'should normalize space in custom property values',
+  processCSS(
+    '@supports (--foo:  ){html{background:green}}',
+    '@supports (--foo: ){html{background:green}}'
+  )
+);
+
+test(
+  'should minimize custom properties with multiple conditions',
+  processCSS(
+    '@supports ((--foo:  ) or (--bar: green )){html{background:green}}',
+    '@supports ((--foo: ) or (--bar:green)){html{background:green}}'
+  )
+);
+
 test(
   'should not throw on empty parentheses',
   passthroughCSS('@media (){h1{color:blue}}')
diff --git a/packages/postcss-normalize-whitespace/src/index.js b/packages/postcss-normalize-whitespace/src/index.js
index e00cb0d95..bc7d64262 100644
--- a/packages/postcss-normalize-whitespace/src/index.js
+++ b/packages/postcss-normalize-whitespace/src/index.js
@@ -65,7 +65,6 @@ function pluginCreator() {
 
           // Remove whitespaces around ie 9 hack
           node.value = node.value.replace(/\s*(\\9)\s*/, '$1');
-
           const value = node.value;
 
           if (cache.has(value)) {
@@ -79,6 +78,9 @@ function pluginCreator() {
             cache.set(value, result);
           }
 
+          if (node.prop.startsWith('--') && node.value === '') {
+            node.value = ' ';
+          }
           // Remove extra semicolons and whitespace before the declaration
           if (node.raws.before) {
             const prev = node.prev();
diff --git a/packages/postcss-normalize-whitespace/test/index.js b/packages/postcss-normalize-whitespace/test/index.js
index c667621a5..ca327a512 100644
--- a/packages/postcss-normalize-whitespace/test/index.js
+++ b/packages/postcss-normalize-whitespace/test/index.js
@@ -58,6 +58,15 @@ test(
   )
 );
 
+test(
+  'should trim space around custom property',
+  processCSS('h1{--prop:  }', 'h1{--prop: }')
+);
+
+test(
+  'should add space around empty custom property',
+  processCSS('h1{--prop:}', 'h1{--prop: }')
+);
 test(
   'should not trim spaces inside of nested var function',
   processCSS(