diff --git a/application/pom.xml b/application/pom.xml
index 3aff9fb365..992267e5f1 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -197,9 +197,8 @@
             <artifactId>springfox-swagger2</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.thingsboard.server</groupId>
+            <groupId>org.thingsboard</groupId>
             <artifactId>tools</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/application/src/test/java/org/thingsboard/server/rpc/AbstractRpcIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java
similarity index 90%
rename from application/src/test/java/org/thingsboard/server/rpc/AbstractRpcIntegrationTest.java
rename to application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java
index 61c3d9d685..8d22343e07 100644
--- a/application/src/test/java/org/thingsboard/server/rpc/AbstractRpcIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.rpc;
+package org.thingsboard.server.mqtt;
 
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +31,7 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.context.WebApplicationContext;
-import org.thingsboard.server.rpc.mqtt.MqttRpcIntergrationTest;
+import org.thingsboard.server.mqtt.telemetry.MqttTelemetryIntergrationTest;
 
 import java.util.Arrays;
 
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNotNull;
  */
 @ActiveProfiles("default")
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=MqttRpcIntergrationTest.class, loader=SpringApplicationContextLoader.class)
+@ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class)
 @TestPropertySource("classpath:cassandra-test.properties")
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 @Configuration
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertNotNull;
 @ComponentScan({"org.thingsboard.server"})
 @WebAppConfiguration
 @IntegrationTest("server.port:8080")
-public class AbstractRpcIntegrationTest {
+public class AbstractFeatureIntegrationTest {
 
     @SuppressWarnings("rawtypes")
     private HttpMessageConverter mappingJackson2HttpMessageConverter;
diff --git a/application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcSuite.java b/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java
similarity index 90%
rename from application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcSuite.java
rename to application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java
index 1c10c96f2e..2628caaa3d 100644
--- a/application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcSuite.java
+++ b/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.rpc.mqtt;
+package org.thingsboard.server.mqtt;
 
 import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
 import org.junit.ClassRule;
@@ -27,8 +27,8 @@ import java.util.Arrays;
  * @author Valerii Sosliuk
  */
 @RunWith(ClasspathSuite.class)
-@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.rpc.mqtt.*Test"})
-public class MqttRpcSuite {
+@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.mqtt.*.*Test"})
+public class MqttSuite {
 
     @ClassRule
     public static CustomCassandraCQLUnit cassandraUnit =
diff --git a/application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcIntergrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java
similarity index 95%
rename from application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcIntergrationTest.java
rename to application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java
index 64abc40896..213f650638 100644
--- a/application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcIntergrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.rpc.mqtt;
+package org.thingsboard.server.mqtt.telemetry;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
@@ -25,7 +25,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 import org.thingsboard.client.tools.RestClient;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
-import org.thingsboard.server.rpc.AbstractRpcIntegrationTest;
+import org.thingsboard.server.mqtt.AbstractFeatureIntegrationTest;
 
 import java.net.URI;
 import java.util.Arrays;
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
  * @author Valerii Sosliuk
  */
 @Slf4j
-public class MqttRpcIntergrationTest extends AbstractRpcIntegrationTest {
+public class MqttTelemetryIntergrationTest extends AbstractFeatureIntegrationTest {
 
     private static final String MQTT_URL = "tcp://localhost:1883";
     private static final String BASE_URL = "http://localhost:8080";
diff --git a/pom.xml b/pom.xml
index bd1faaea6b..c34a454f0c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -364,6 +364,12 @@
                 <artifactId>dao</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.thingsboard</groupId>
+                <artifactId>tools</artifactId>
+                <version>${project.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.thingsboard</groupId>
                 <artifactId>dao</artifactId>