diff --git a/packages/styled/__tests__/__snapshots__/styled.js.snap b/packages/styled/__tests__/__snapshots__/styled.js.snap
index 467a48a41..7546e156c 100644
--- a/packages/styled/__tests__/__snapshots__/styled.js.snap
+++ b/packages/styled/__tests__/__snapshots__/styled.js.snap
@@ -376,10 +376,17 @@ exports[`styled no prop filtering on non string tags 1`] = `
 }
 
 <a
+  a="true"
   aria-label="some label"
+  b="true"
   class="emotion-0"
+  cool="true"
   data-wow="value"
+  filtering="true"
   href="link"
+  is="true"
+  prop="true"
+  wow="true"
 >
   hello world
 </a>
@@ -391,10 +398,17 @@ exports[`styled no prop filtering on string tags started with upper case 1`] = `
 }
 
 <somecustomlink
+  a="true"
   aria-label="some label"
+  b="true"
   class="emotion-0"
+  cool="true"
   data-wow="value"
+  filtering="true"
   href="link"
+  is="true"
+  prop="true"
+  wow="true"
 >
   hello world
 </somecustomlink>
@@ -489,6 +503,7 @@ exports[`styled prop filtering 1`] = `
   class="emotion-0"
   data-wow="value"
   href="link"
+  is="true"
 >
   hello world
 </a>
@@ -505,6 +520,7 @@ exports[`styled prop filtering on composed styled components that are string tag
   class="emotion-0"
   data-wow="value"
   href="link"
+  is="true"
 >
   hello world
 </a>
diff --git a/packages/styled/__tests__/styled.js b/packages/styled/__tests__/styled.js
index 083fbda0a..07c9b0b3c 100644
--- a/packages/styled/__tests__/styled.js
+++ b/packages/styled/__tests__/styled.js
@@ -466,13 +466,13 @@ describe('styled', () => {
 
     const { container } = render(
       <Link
-        a
-        b
-        wow
-        prop
-        filtering
-        is
-        cool
+        a="true"
+        b="true"
+        wow="true"
+        prop="true"
+        filtering="true"
+        is="true"
+        cool="true"
         aria-label="some label"
         data-wow="value"
         href="link"
@@ -491,13 +491,13 @@ describe('styled', () => {
 
     const { container } = render(
       <Link
-        a
-        b
-        wow
-        prop
-        filtering
-        is
-        cool
+        a="true"
+        b="true"
+        wow="true"
+        prop="true"
+        filtering="true"
+        is="true"
+        cool="true"
         aria-label="some label"
         data-wow="value"
         href="link"
@@ -516,13 +516,13 @@ describe('styled', () => {
 
     const { container } = render(
       <Link
-        a
-        b
-        wow
-        prop
-        filtering
-        is
-        cool
+        a="true"
+        b="true"
+        wow="true"
+        prop="true"
+        filtering="true"
+        is="true"
+        cool="true"
         aria-label="some label"
         data-wow="value"
         href="link"
@@ -544,13 +544,13 @@ describe('styled', () => {
 
     const { container } = render(
       <Link
-        a
-        b
-        wow
-        prop
-        filtering
-        is
-        cool
+        a="true"
+        b="true"
+        wow="true"
+        prop="true"
+        filtering="true"
+        is="true"
+        cool="true"
         aria-label="some label"
         data-wow="value"
         href="link"
diff --git a/packages/styled/test/__snapshots__/prop-filtering.test.js.snap b/packages/styled/test/__snapshots__/prop-filtering.test.js.snap
index 0d666843c..e36143362 100644
--- a/packages/styled/test/__snapshots__/prop-filtering.test.js.snap
+++ b/packages/styled/test/__snapshots__/prop-filtering.test.js.snap
@@ -33,10 +33,17 @@ exports[`no prop filtering on non string tags 1`] = `
 }
 
 <a
+  a="true"
   aria-label="some label"
+  b="true"
   class="emotion-0 emotion-1"
+  cool="true"
   data-wow="value"
+  filtering="true"
   href="link"
+  is="true"
+  prop="true"
+  wow="true"
 >
   hello world
 </a>
@@ -48,10 +55,17 @@ exports[`no prop filtering on string tags started with upper case 1`] = `
 }
 
 <somecustomlink
+  a="true"
   aria-label="some label"
+  b="true"
   class="emotion-0 emotion-1"
+  cool="true"
   data-wow="value"
+  filtering="true"
   href="link"
+  is="true"
+  prop="true"
+  wow="true"
 >
   hello world
 </somecustomlink>
@@ -67,6 +81,7 @@ exports[`prop filtering 1`] = `
   class="emotion-0 emotion-1"
   data-wow="value"
   href="link"
+  is="true"
 >
   hello world
 </a>
diff --git a/packages/styled/test/prop-filtering.test.js b/packages/styled/test/prop-filtering.test.js
index 927f3fde6..461393f2f 100644
--- a/packages/styled/test/prop-filtering.test.js
+++ b/packages/styled/test/prop-filtering.test.js
@@ -73,13 +73,13 @@ test('prop filtering', () => {
 
   const { container } = render(
     <Link
-      a
-      b
-      wow
-      prop
-      filtering
-      is
-      cool
+      a="true"
+      b="true"
+      wow="true"
+      prop="true"
+      filtering="true"
+      is="true"
+      cool="true"
       aria-label="some label"
       data-wow="value"
       href="link"
@@ -98,13 +98,13 @@ test('no prop filtering on non string tags', () => {
 
   const { container } = render(
     <Link
-      a
-      b
-      wow
-      prop
-      filtering
-      is
-      cool
+      a="true"
+      b="true"
+      wow="true"
+      prop="true"
+      filtering="true"
+      is="true"
+      cool="true"
       aria-label="some label"
       data-wow="value"
       href="link"
@@ -123,13 +123,13 @@ test('no prop filtering on string tags started with upper case', () => {
 
   const { container } = render(
     <Link
-      a
-      b
-      wow
-      prop
-      filtering
-      is
-      cool
+      a="true"
+      b="true"
+      wow="true"
+      prop="true"
+      filtering="true"
+      is="true"
+      cool="true"
       aria-label="some label"
       data-wow="value"
       href="link"