diff --git a/tests/unit/ComplexGoodTest.php b/tests/ComplexGoodTest.php
similarity index 94%
rename from tests/unit/ComplexGoodTest.php
rename to tests/ComplexGoodTest.php
index f7ce675..b8f6927 100644
--- a/tests/unit/ComplexGoodTest.php
+++ b/tests/ComplexGoodTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+namespace Cable8mm\GoodCodeParser\Tests;
 
 use Cable8mm\GoodCodeParser\GoodCodeParser;
 use Cable8mm\GoodCodeParser\Parsers\ComplexGood;
diff --git a/tests/unit/GiftGoodTest.php b/tests/GiftGoodTest.php
similarity index 94%
rename from tests/unit/GiftGoodTest.php
rename to tests/GiftGoodTest.php
index 2542073..de8e77e 100644
--- a/tests/unit/GiftGoodTest.php
+++ b/tests/GiftGoodTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+namespace Cable8mm\GoodCodeParser\Tests;
 
 use Cable8mm\GoodCodeParser\GoodCodeParser;
 use Cable8mm\GoodCodeParser\Parsers\GiftGood;
diff --git a/tests/unit/OptionGoodTest.php b/tests/OptionGoodTest.php
similarity index 97%
rename from tests/unit/OptionGoodTest.php
rename to tests/OptionGoodTest.php
index d1b3521..ef5e4d9 100644
--- a/tests/unit/OptionGoodTest.php
+++ b/tests/OptionGoodTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+namespace Cable8mm\GoodCodeParser\Tests;
 
 use Cable8mm\GoodCodeParser\OptionCodeParser;
 use Cable8mm\GoodCodeParser\Parsers\OptionGood;
diff --git a/tests/unit/SetGoodTest.php b/tests/SetGoodTest.php
similarity index 96%
rename from tests/unit/SetGoodTest.php
rename to tests/SetGoodTest.php
index 0f7ebd3..e4546b8 100644
--- a/tests/unit/SetGoodTest.php
+++ b/tests/SetGoodTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+namespace Cable8mm\GoodCodeParser\Tests;
 
 use Cable8mm\GoodCodeParser\GoodCodeParser;
 use Cable8mm\GoodCodeParser\Parsers\SetGood;
diff --git a/tests/functional/.gitignore b/tests/functional/.gitignore
deleted file mode 100644
index b722e9e..0000000
--- a/tests/functional/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore
\ No newline at end of file
diff --git a/tests/unit/.gitignore b/tests/unit/.gitignore
deleted file mode 100644
index b722e9e..0000000
--- a/tests/unit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore
\ No newline at end of file