diff --git a/t/controller_Billing.t b/t/controller_Billing.t
deleted file mode 100644
index df6ec64d74..0000000000
--- a/t/controller_Billing.t
+++ /dev/null
@@ -1,10 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-
-use Catalyst::Test 'NGCP::Panel';
-use NGCP::Panel::Controller::Billing;
-
-ok( request('/billing')->is_success || request('/billing')->is_redirect, 'Request should succeed' );
-done_testing();
diff --git a/t/controller_Dashboard.t b/t/controller_Dashboard.t
deleted file mode 100644
index 35e7e8b9e7..0000000000
--- a/t/controller_Dashboard.t
+++ /dev/null
@@ -1,12 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-
-use Catalyst::Test 'NGCP::Panel';
-use NGCP::Panel::Controller::Dashboard;
-
-my $response = request('/dashboard');
-
-ok( $response->is_success || $response->is_redirect , 'Request should succeed' );
-done_testing();
diff --git a/t/controller_Login.t b/t/controller_Login.t
deleted file mode 100644
index 9f76086f81..0000000000
--- a/t/controller_Login.t
+++ /dev/null
@@ -1,10 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-
-use Catalyst::Test 'NGCP::Panel';
-use NGCP::Panel::Controller::Login;
-
-ok( request('/login')->is_success, 'Request should succeed' );
-done_testing();
diff --git a/t/controller_NCOS.t b/t/controller_NCOS.t
deleted file mode 100644
index 4fa8ae0e88..0000000000
--- a/t/controller_NCOS.t
+++ /dev/null
@@ -1,10 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-
-use Catalyst::Test 'NGCP::Panel';
-use NGCP::Panel::Controller::NCOS;
-
-ok( request('/ncos')->is_success || request('/ncos')->is_redirect, 'Request should succeed' );
-done_testing();
diff --git a/t/controller_Peering.t b/t/controller_Peering.t
deleted file mode 100644
index d7f68c8271..0000000000
--- a/t/controller_Peering.t
+++ /dev/null
@@ -1,10 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-
-use Catalyst::Test 'NGCP::Panel';
-use NGCP::Panel::Controller::Peering;
-
-ok( request('/peering')->is_success || request('/peering')->is_redirect, 'Request should succeed' );
-done_testing();
diff --git a/t/controller_Sound.t b/t/controller_Sound.t
deleted file mode 100644
index 4fdba84ab8..0000000000
--- a/t/controller_Sound.t
+++ /dev/null
@@ -1,10 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-
-use Catalyst::Test 'NGCP::Panel';
-use NGCP::Panel::Controller::Sound;
-
-ok( request('/sound')->is_success || request('/sound')->is_redirect, 'Request should succeed' );
-done_testing();
diff --git a/t/controller_basic_calls.t b/t/controller_basic_calls.t
new file mode 100644
index 0000000000..57de641ca5
--- /dev/null
+++ b/t/controller_basic_calls.t
@@ -0,0 +1,40 @@
+use Sipwise::Base;
+use Test::More;
+
+BEGIN {
+    use_ok ('Catalyst::Test', 'NGCP::Panel');
+    use_ok 'NGCP::Panel::Controller::Administrator';
+    use_ok 'NGCP::Panel::Controller::Billing';
+    use_ok 'NGCP::Panel::Controller::Callflow';
+    use_ok 'NGCP::Panel::Controller::Contact';
+    use_ok 'NGCP::Panel::Controller::Contract';
+    use_ok 'NGCP::Panel::Controller::Customer';
+    use_ok 'NGCP::Panel::Controller::Dashboard';
+    use_ok 'NGCP::Panel::Controller::Device';
+    use_ok 'NGCP::Panel::Controller::Domain';
+    use_ok 'NGCP::Panel::Controller::Login';
+    use_ok 'NGCP::Panel::Controller::Logout';
+    use_ok 'NGCP::Panel::Controller::NCOS';
+    use_ok 'NGCP::Panel::Controller::Peering';
+    use_ok 'NGCP::Panel::Controller::Product';
+    use_ok 'NGCP::Panel::Controller::Reseller';
+    use_ok 'NGCP::Panel::Controller::Rewrite';
+    use_ok 'NGCP::Panel::Controller::Root';
+    use_ok 'NGCP::Panel::Controller::Security';
+    use_ok 'NGCP::Panel::Controller::Sound';
+    use_ok 'NGCP::Panel::Controller::Statistics';
+    use_ok 'NGCP::Panel::Controller::Subscriber';
+}
+
+my @controller_paths = ('/administrator','/billing','/callflow','/contact',
+    '/contract','/customer','/dashboard','/device','/domain','/logout',
+    '/ncos','/peering','/reseller','/rewrite','/security',
+    '/sound','/statistics','/subscriber');
+for my $path (@controller_paths) {
+    ok(request($path)->is_redirect, "$path should redirect" );
+}
+
+ok( request('/login')->is_success, '/login should succeed' );
+
+done_testing();
+