diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php
index 37c9b79740..aa4f23e378 100644
--- a/tests/Feature/Controllers/AccountControllerTest.php
+++ b/tests/Feature/Controllers/AccountControllerTest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types = 1);
 
-namespace Feature\Controllers;
+namespace Tests\Feature\Controllers;
 
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php
index 39f8cab2b6..b405130351 100644
--- a/tests/Feature/Controllers/AttachmentControllerTest.php
+++ b/tests/Feature/Controllers/AttachmentControllerTest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types = 1);
 
-namespace Feature\Controllers;
+namespace Tests\Feature\Controllers;
 
 
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php
new file mode 100644
index 0000000000..7f096c34ce
--- /dev/null
+++ b/tests/Feature/Controllers/BillControllerTest.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * BillControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+
+use Tests\TestCase;
+
+class BillControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php
new file mode 100644
index 0000000000..8c1ce793ba
--- /dev/null
+++ b/tests/Feature/Controllers/BudgetControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * BudgetControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class BudgetControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php
new file mode 100644
index 0000000000..f14630ff1c
--- /dev/null
+++ b/tests/Feature/Controllers/CategoryControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * CategoryControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class CategoryControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/CurrencyControllerTest.php b/tests/Feature/Controllers/CurrencyControllerTest.php
new file mode 100644
index 0000000000..e07827fc47
--- /dev/null
+++ b/tests/Feature/Controllers/CurrencyControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * CurrencyControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class CurrencyControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php
new file mode 100644
index 0000000000..ef38ddc937
--- /dev/null
+++ b/tests/Feature/Controllers/ExportControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * ExportControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class ExportControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/HelpControllerTest.php b/tests/Feature/Controllers/HelpControllerTest.php
new file mode 100644
index 0000000000..90d81a5093
--- /dev/null
+++ b/tests/Feature/Controllers/HelpControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * HelpControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class HelpControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php
new file mode 100644
index 0000000000..4bbf838743
--- /dev/null
+++ b/tests/Feature/Controllers/HomeControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * HomeControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class HomeControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/ImportControllerTest.php b/tests/Feature/Controllers/ImportControllerTest.php
new file mode 100644
index 0000000000..ba33608fe1
--- /dev/null
+++ b/tests/Feature/Controllers/ImportControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * ImportControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class ImportControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php
new file mode 100644
index 0000000000..5eee1de137
--- /dev/null
+++ b/tests/Feature/Controllers/JsonControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * JsonControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class JsonControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php
new file mode 100644
index 0000000000..7b0f34007d
--- /dev/null
+++ b/tests/Feature/Controllers/NewUserControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * NewUserControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class NewUserControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php
new file mode 100644
index 0000000000..5ec0b57c27
--- /dev/null
+++ b/tests/Feature/Controllers/PiggyBankControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * PiggyBankControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class PiggyBankControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php
new file mode 100644
index 0000000000..d79a78f635
--- /dev/null
+++ b/tests/Feature/Controllers/PreferencesControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * PreferencesControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class PreferencesControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php
new file mode 100644
index 0000000000..3a98d2ae4a
--- /dev/null
+++ b/tests/Feature/Controllers/ProfileControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * ProfileControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class ProfileControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php
new file mode 100644
index 0000000000..094a233284
--- /dev/null
+++ b/tests/Feature/Controllers/ReportControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * ReportControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class ReportControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php
new file mode 100644
index 0000000000..9dac939b49
--- /dev/null
+++ b/tests/Feature/Controllers/RuleControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * RuleControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class RuleControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php
new file mode 100644
index 0000000000..38bc98a0cf
--- /dev/null
+++ b/tests/Feature/Controllers/RuleGroupControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * RuleGroupControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class RuleGroupControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php
new file mode 100644
index 0000000000..181c2686df
--- /dev/null
+++ b/tests/Feature/Controllers/SearchControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * SearchControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class SearchControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php
new file mode 100644
index 0000000000..90108801f6
--- /dev/null
+++ b/tests/Feature/Controllers/TagControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * TagControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class TagControllerTest extends TestCase
+{
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php
new file mode 100644
index 0000000000..939349c3fc
--- /dev/null
+++ b/tests/Feature/Controllers/TransactionControllerTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * TransactionControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace Tests\Feature\Controllers;
+
+use Tests\TestCase;
+
+class TransactionControllerTest extends TestCase
+{
+
+}
\ No newline at end of file