diff --git a/karma.conf.js b/karma.conf.js
index ecff1f619..63e9fb1e0 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -55,22 +55,8 @@ module.exports = function(config) {
       'js/routes.js',
       'js/directives.js',
       'js/filters.js',
-      'js/services/socket.js',
-      'js/services/video.js',
-      'js/services/walletFactory.js',
-      'js/services/controllerUtils.js',
-      'js/services/passphrase.js',
-      'js/services/notifications.js',
-      'js/controllers/header.js',
-      'js/controllers/footer.js',
-      'js/controllers/addresses.js',
-      'js/controllers/transactions.js',
-      'js/controllers/send.js',
-      'js/controllers/backup.js',
-      'js/controllers/signin.js',
-      'js/controllers/setup.js',
-      'js/controllers/import.js',
-      'js/controllers/settings.js',
+      'js/services/*.js',
+      'js/controllers/*.js',
       'js/init.js'
     ],