diff --git a/test/Fixture/Classy/WithMethodsNamedAfterKeywords/source.php b/test/Fixture/Classy/Php72/WithMethodsNamedAfterKeywords/source.php
similarity index 64%
rename from test/Fixture/Classy/WithMethodsNamedAfterKeywords/source.php
rename to test/Fixture/Classy/Php72/WithMethodsNamedAfterKeywords/source.php
index d53b0bbf..9f74288f 100644
--- a/test/Fixture/Classy/WithMethodsNamedAfterKeywords/source.php
+++ b/test/Fixture/Classy/Php72/WithMethodsNamedAfterKeywords/source.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithMethodsNamedAfterKeywords;
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithMethodsNamedAfterKeywords;
 
 class Foo
 {
diff --git a/test/Fixture/Classy/WithMethodsNamedAfterKeywordsAndReturnType/source.php b/test/Fixture/Classy/Php72/WithMethodsNamedAfterKeywordsAndReturnType/source.php
similarity index 64%
rename from test/Fixture/Classy/WithMethodsNamedAfterKeywordsAndReturnType/source.php
rename to test/Fixture/Classy/Php72/WithMethodsNamedAfterKeywordsAndReturnType/source.php
index 1711a141..bced7042 100644
--- a/test/Fixture/Classy/WithMethodsNamedAfterKeywordsAndReturnType/source.php
+++ b/test/Fixture/Classy/Php72/WithMethodsNamedAfterKeywordsAndReturnType/source.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithMethodsNamedAfterKeywordsAndReturnType;
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithMethodsNamedAfterKeywordsAndReturnType;
 
 
 class Foo
diff --git a/test/Fixture/Classy/Php72/WithinMultipleNamespaces/source.php b/test/Fixture/Classy/Php72/WithinMultipleNamespaces/source.php
new file mode 100644
index 00000000..57bbf1f9
--- /dev/null
+++ b/test/Fixture/Classy/Php72/WithinMultipleNamespaces/source.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithinMultipleNamespaces\Foo;
+{
+    class Foo {}
+
+    interface Bar {}
+
+    trait Baz {}
+}
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithinMultipleNamespaces\Bar;
+{
+    class Foo {}
+
+    interface Bar {}
+
+    trait Baz {}
+}
diff --git a/test/Fixture/Classy/Php72/WithinNamespace/source.php b/test/Fixture/Classy/Php72/WithinNamespace/source.php
new file mode 100644
index 00000000..342c432b
--- /dev/null
+++ b/test/Fixture/Classy/Php72/WithinNamespace/source.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithinNamespace;
+
+class Foo {}
+
+interface Bar {}
+
+trait Baz {}
diff --git a/test/Fixture/Classy/WithinNamespaceAndMultiLineComments/source.php b/test/Fixture/Classy/Php72/WithinNamespaceAndMultiLineComments/source.php
similarity index 61%
rename from test/Fixture/Classy/WithinNamespaceAndMultiLineComments/source.php
rename to test/Fixture/Classy/Php72/WithinNamespaceAndMultiLineComments/source.php
index bc3ca795..bdbd75fc 100644
--- a/test/Fixture/Classy/WithinNamespaceAndMultiLineComments/source.php
+++ b/test/Fixture/Classy/Php72/WithinNamespaceAndMultiLineComments/source.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithinNamespaceAndMultiLineComments;
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithinNamespaceAndMultiLineComments;
 
 /* foo */ class /* bar */ Foo /* baz */ {}
 
diff --git a/test/Fixture/Classy/WithinNamespaceAndShellStyleComments/source.php b/test/Fixture/Classy/Php72/WithinNamespaceAndShellStyleComments/source.php
similarity index 50%
rename from test/Fixture/Classy/WithinNamespaceAndShellStyleComments/source.php
rename to test/Fixture/Classy/Php72/WithinNamespaceAndShellStyleComments/source.php
index dd1067c5..71c44064 100644
--- a/test/Fixture/Classy/WithinNamespaceAndShellStyleComments/source.php
+++ b/test/Fixture/Classy/Php72/WithinNamespaceAndShellStyleComments/source.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithinNamespaceAndShellStyleComments;
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithinNamespaceAndShellStyleComments;
 
 class # foo
 Foo # bar
diff --git a/test/Fixture/Classy/WithinNamespaceAndSingleLineComments/source.php b/test/Fixture/Classy/Php72/WithinNamespaceAndSingleLineComments/source.php
similarity index 51%
rename from test/Fixture/Classy/WithinNamespaceAndSingleLineComments/source.php
rename to test/Fixture/Classy/Php72/WithinNamespaceAndSingleLineComments/source.php
index 94ad7f88..89ac18b7 100644
--- a/test/Fixture/Classy/WithinNamespaceAndSingleLineComments/source.php
+++ b/test/Fixture/Classy/Php72/WithinNamespaceAndSingleLineComments/source.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithinNamespaceAndSingleLineComments;
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithinNamespaceAndSingleLineComments;
 
 class // foo
 Foo // bar
diff --git a/test/Fixture/Classy/Php72/WithinNamespaceWithBraces/source.php b/test/Fixture/Classy/Php72/WithinNamespaceWithBraces/source.php
new file mode 100644
index 00000000..b59533ce
--- /dev/null
+++ b/test/Fixture/Classy/Php72/WithinNamespaceWithBraces/source.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Ergebnis\Classy\Test\Fixture\Classy\Php72\WithinNamespaceWithBraces
+{
+    class Foo {}
+
+    interface Bar {}
+
+    trait Baz {}
+}
diff --git a/test/Fixture/Classy/WithinNamespaceWithSingleSegment/source.php b/test/Fixture/Classy/Php72/WithinNamespaceWithSingleSegment/source.php
similarity index 100%
rename from test/Fixture/Classy/WithinNamespaceWithSingleSegment/source.php
rename to test/Fixture/Classy/Php72/WithinNamespaceWithSingleSegment/source.php
diff --git a/test/Fixture/Classy/WithoutNamespace/source.php b/test/Fixture/Classy/Php72/WithoutNamespace/source.php
similarity index 100%
rename from test/Fixture/Classy/WithoutNamespace/source.php
rename to test/Fixture/Classy/Php72/WithoutNamespace/source.php
diff --git a/test/Fixture/Classy/WithoutNamespaceAndMultiLineComments/source.php b/test/Fixture/Classy/Php72/WithoutNamespaceAndMultiLineComments/source.php
similarity index 100%
rename from test/Fixture/Classy/WithoutNamespaceAndMultiLineComments/source.php
rename to test/Fixture/Classy/Php72/WithoutNamespaceAndMultiLineComments/source.php
diff --git a/test/Fixture/Classy/WithoutNamespaceAndShellStyleComments/source.php b/test/Fixture/Classy/Php72/WithoutNamespaceAndShellStyleComments/source.php
similarity index 100%
rename from test/Fixture/Classy/WithoutNamespaceAndShellStyleComments/source.php
rename to test/Fixture/Classy/Php72/WithoutNamespaceAndShellStyleComments/source.php
diff --git a/test/Fixture/Classy/WithoutNamespaceAndSingleLineComments/source.php b/test/Fixture/Classy/Php72/WithoutNamespaceAndSingleLineComments/source.php
similarity index 100%
rename from test/Fixture/Classy/WithoutNamespaceAndSingleLineComments/source.php
rename to test/Fixture/Classy/Php72/WithoutNamespaceAndSingleLineComments/source.php
diff --git a/test/Fixture/Classy/WithinMultipleNamespaces/source.php b/test/Fixture/Classy/WithinMultipleNamespaces/source.php
deleted file mode 100644
index 7c8a8d6a..00000000
--- a/test/Fixture/Classy/WithinMultipleNamespaces/source.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithinMultipleNamespaces\Foo;
-{
-    class Foo {}
-
-    interface Bar {}
-
-    trait Baz {}
-}
-
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithinMultipleNamespaces\Bar;
-{
-    class Foo {}
-
-    interface Bar {}
-
-    trait Baz {}
-}
diff --git a/test/Fixture/Classy/WithinNamespace/source.php b/test/Fixture/Classy/WithinNamespace/source.php
deleted file mode 100644
index 58a7b1da..00000000
--- a/test/Fixture/Classy/WithinNamespace/source.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithinNamespace;
-
-class Foo {}
-
-interface Bar {}
-
-trait Baz {}
diff --git a/test/Fixture/Classy/WithinNamespaceWithBraces/source.php b/test/Fixture/Classy/WithinNamespaceWithBraces/source.php
deleted file mode 100644
index 1103b837..00000000
--- a/test/Fixture/Classy/WithinNamespaceWithBraces/source.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Ergebnis\Classy\Test\Fixture\Classy\WithinNamespaceWithBraces
-{
-    class Foo {}
-
-    interface Bar {}
-
-    trait Baz {}
-}
diff --git a/test/Unit/ConstructsTest.php b/test/Unit/ConstructsTest.php
index 0172e823..4072507d 100644
--- a/test/Unit/ConstructsTest.php
+++ b/test/Unit/ConstructsTest.php
@@ -172,58 +172,58 @@ public function provideScenarioWithClassyConstructs(): \Generator
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'within-namespace',
-                __DIR__ . '/../Fixture/Classy/WithinNamespace/source.php',
-                Construct::fromName(Test\Fixture\Classy\WithinNamespace\Bar::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespace\Baz::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespace\Foo::class)
+                __DIR__ . '/../Fixture/Classy/Php72/WithinNamespace/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespace\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespace\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespace\Foo::class)
             ),
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'within-namespace-and-shell-style-comments',
-                __DIR__ . '/../Fixture/Classy/WithinNamespaceAndShellStyleComments/source.php',
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndShellStyleComments\Bar::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndShellStyleComments\Baz::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndShellStyleComments\Foo::class)
+                __DIR__ . '/../Fixture/Classy/Php72/WithinNamespaceAndShellStyleComments/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndShellStyleComments\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndShellStyleComments\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndShellStyleComments\Foo::class)
             ),
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'within-namespace-and-single-line-comments',
-                __DIR__ . '/../Fixture/Classy/WithinNamespaceAndSingleLineComments/source.php',
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndSingleLineComments\Bar::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndSingleLineComments\Baz::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndSingleLineComments\Foo::class)
+                __DIR__ . '/../Fixture/Classy/Php72/WithinNamespaceAndSingleLineComments/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndSingleLineComments\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndSingleLineComments\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndSingleLineComments\Foo::class)
             ),
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'within-namespace-and-multi-line-comments',
-                __DIR__ . '/../Fixture/Classy/WithinNamespaceAndMultiLineComments/source.php',
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndMultiLineComments\Bar::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndMultiLineComments\Baz::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceAndMultiLineComments\Foo::class)
+                __DIR__ . '/../Fixture/Classy/Php72/WithinNamespaceAndMultiLineComments/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndMultiLineComments\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndMultiLineComments\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceAndMultiLineComments\Foo::class)
             ),
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'within-namespace-with-braces',
-                __DIR__ . '/../Fixture/Classy/WithinNamespaceWithBraces/source.php',
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceWithBraces\Bar::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceWithBraces\Baz::class),
-                Construct::fromName(Test\Fixture\Classy\WithinNamespaceWithBraces\Foo::class)
+                __DIR__ . '/../Fixture/Classy/Php72/WithinNamespaceWithBraces/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceWithBraces\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceWithBraces\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinNamespaceWithBraces\Foo::class)
             ),
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'within-multiple-namespaces-with-braces',
-                __DIR__ . '/../Fixture/Classy/WithinMultipleNamespaces/source.php',
-                Construct::fromName(Test\Fixture\Classy\WithinMultipleNamespaces\Bar\Bar::class),
-                Construct::fromName(Test\Fixture\Classy\WithinMultipleNamespaces\Bar\Baz::class),
-                Construct::fromName(Test\Fixture\Classy\WithinMultipleNamespaces\Bar\Foo::class),
-                Construct::fromName(Test\Fixture\Classy\WithinMultipleNamespaces\Foo\Bar::class),
-                Construct::fromName(Test\Fixture\Classy\WithinMultipleNamespaces\Foo\Baz::class),
-                Construct::fromName(Test\Fixture\Classy\WithinMultipleNamespaces\Foo\Foo::class)
+                __DIR__ . '/../Fixture/Classy/Php72/WithinMultipleNamespaces/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinMultipleNamespaces\Bar\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinMultipleNamespaces\Bar\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinMultipleNamespaces\Bar\Foo::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinMultipleNamespaces\Foo\Bar::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinMultipleNamespaces\Foo\Baz::class),
+                Construct::fromName(Test\Fixture\Classy\Php72\WithinMultipleNamespaces\Foo\Foo::class)
             ),
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'within-namespace-with-single-segment',
-                __DIR__ . '/../Fixture/Classy/WithinNamespaceWithSingleSegment/source.php',
+                __DIR__ . '/../Fixture/Classy/Php72/WithinNamespaceWithSingleSegment/source.php',
                 Construct::fromName('Ergebnis\\Bar'),
                 Construct::fromName('Ergebnis\\Baz'),
                 Construct::fromName('Ergebnis\\Foo')
@@ -231,8 +231,8 @@ public function provideScenarioWithClassyConstructs(): \Generator
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'with-methods-named-after-keywords',
-                __DIR__ . '/../Fixture/Classy/WithMethodsNamedAfterKeywords/source.php',
-                Construct::fromName(Test\Fixture\Classy\WithMethodsNamedAfterKeywords\Foo::class)
+                __DIR__ . '/../Fixture/Classy/Php72/WithMethodsNamedAfterKeywords/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php72\WithMethodsNamedAfterKeywords\Foo::class)
             ),
             /**
              * @see https://github.com/zendframework/zend-file/pull/41
@@ -240,13 +240,13 @@ public function provideScenarioWithClassyConstructs(): \Generator
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'with-methods-named-after-keywords-and-return-type',
-                __DIR__ . '/../Fixture/Classy/WithMethodsNamedAfterKeywordsAndReturnType/source.php',
-                Construct::fromName(Test\Fixture\Classy\WithMethodsNamedAfterKeywordsAndReturnType\Foo::class)
+                __DIR__ . '/../Fixture/Classy/Php72/WithMethodsNamedAfterKeywordsAndReturnType/source.php',
+                Construct::fromName(Test\Fixture\Classy\Php72\WithMethodsNamedAfterKeywordsAndReturnType\Foo::class)
             ),
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'without-namespace',
-                __DIR__ . '/../Fixture/Classy/WithoutNamespace/source.php',
+                __DIR__ . '/../Fixture/Classy/Php72/WithoutNamespace/source.php',
                 Construct::fromName('Bar'),
                 Construct::fromName('Baz'),
                 Construct::fromName('Foo')
@@ -254,7 +254,7 @@ public function provideScenarioWithClassyConstructs(): \Generator
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'without-namespace-and-multi-line-comments',
-                __DIR__ . '/../Fixture/Classy/WithoutNamespaceAndMultiLineComments/source.php',
+                __DIR__ . '/../Fixture/Classy/Php72/WithoutNamespaceAndMultiLineComments/source.php',
                 Construct::fromName('Quux'),
                 Construct::fromName('Quuz'),
                 Construct::fromName('Qux')
@@ -262,7 +262,7 @@ public function provideScenarioWithClassyConstructs(): \Generator
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'without-namespace-and-shell-line-comments',
-                __DIR__ . '/../Fixture/Classy/WithoutNamespaceAndShellStyleComments/source.php',
+                __DIR__ . '/../Fixture/Classy/Php72/WithoutNamespaceAndShellStyleComments/source.php',
                 Construct::fromName('Corge'),
                 Construct::fromName('Garply'),
                 Construct::fromName('Grault')
@@ -270,7 +270,7 @@ public function provideScenarioWithClassyConstructs(): \Generator
             Test\Util\Scenario::create(
                 Test\Util\PhpVersion::fromInt(70200),
                 'without-namespace-and-single-line-comments',
-                __DIR__ . '/../Fixture/Classy/WithoutNamespaceAndSingleLineComments/source.php',
+                __DIR__ . '/../Fixture/Classy/Php72/WithoutNamespaceAndSingleLineComments/source.php',
                 Construct::fromName('Fred'),
                 Construct::fromName('Plugh'),
                 Construct::fromName('Waldo')