diff --git a/application/src/main/scripts/windows/install.bat b/application/src/main/scripts/windows/install.bat
index 97c4feb503..562661435b 100644
--- a/application/src/main/scripts/windows/install.bat
+++ b/application/src/main/scripts/windows/install.bat
@@ -73,7 +73,7 @@ IF "%JRE_PATH2%" == ""  GOTO JAVA_NOT_INSTALLED
 
 @ECHO Java 1.8 found!
 @ECHO Installing ${pkg.name} ...
-${pkg.name}.exe install
+%~dp0${pkg.name}.exe install
 
 @ECHO DONE.
 
diff --git a/application/src/main/scripts/windows/uninstall.bat b/application/src/main/scripts/windows/uninstall.bat
index d07cf870ca..921e4c8395 100644
--- a/application/src/main/scripts/windows/uninstall.bat
+++ b/application/src/main/scripts/windows/uninstall.bat
@@ -4,6 +4,6 @@
 net stop ${pkg.name}
 
 @ECHO Uninstalling ${pkg.name} ...
-${pkg.name}.exe uninstall
+%~dp0${pkg.name}.exe uninstall
 
 @ECHO DONE.
\ No newline at end of file
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
index ce5cfcee0b..b9647e514d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
@@ -89,7 +89,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC
 @ActiveProfiles("test")
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes=AbstractControllerTest.class, loader=SpringApplicationContextLoader.class)
-@TestPropertySource("classpath:cassandra-test.properties")
+@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"})
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 @Configuration
 @EnableAutoConfiguration
diff --git a/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java
index c54a85f780..0f449d3310 100644
--- a/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull;
 @ActiveProfiles("default")
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class)
-@TestPropertySource("classpath:cassandra-test.properties")
+@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"})
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 @Configuration
 @EnableAutoConfiguration
diff --git a/application/src/test/resources/thingsboard-test.properties b/application/src/test/resources/thingsboard-test.properties
new file mode 100644
index 0000000000..203f23972a
--- /dev/null
+++ b/application/src/test/resources/thingsboard-test.properties
@@ -0,0 +1 @@
+updates.enabled=false
\ No newline at end of file