diff --git a/application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java b/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java
similarity index 89%
rename from application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java
rename to application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java
index 3ce72d24bd..98e558fc0a 100644
--- a/application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java
+++ b/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server;
+package org.thingsboard.server.controller;
 
 import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
 import org.junit.ClassRule;
@@ -25,9 +25,8 @@ import java.util.Arrays;
 
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
-        "org.thingsboard.server.controller.*Test",
-        "org.thingsboard.server.mqtt.*.*Test"})
-public class ApplicationServerTestSuite {
+        "org.thingsboard.server.controller.*Test"})
+public class ControllerTestSuite {
 
     @ClassRule
     public static CustomCassandraCQLUnit cassandraUnit =
diff --git a/application/src/test/java/org/thingsboard/server/mqtt/MqttTestSuite.java b/application/src/test/java/org/thingsboard/server/mqtt/MqttTestSuite.java
new file mode 100644
index 0000000000..cf3bc71532
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/mqtt/MqttTestSuite.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016-2017 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.mqtt;
+
+import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
+import org.junit.ClassRule;
+import org.junit.extensions.cpsuite.ClasspathSuite;
+import org.junit.runner.RunWith;
+import org.thingsboard.server.dao.CustomCassandraCQLUnit;
+
+import java.util.Arrays;
+
+@RunWith(ClasspathSuite.class)
+@ClasspathSuite.ClassnameFilters({
+        "org.thingsboard.server.mqtt.*.*Test"})
+public class MqttTestSuite {
+
+    @ClassRule
+    public static CustomCassandraCQLUnit cassandraUnit =
+            new CustomCassandraCQLUnit(
+                    Arrays.asList(
+                            new ClassPathCQLDataSet("cassandra/schema.cql", false, false),
+                            new ClassPathCQLDataSet("cassandra/system-data.cql", false, false)),
+                    "cassandra-test.yaml", 30000l);
+}