diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index 41a97cec..a21bd493 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -5,6 +5,7 @@ android {
 
     defaultConfig {
         applicationId "com.health.openscale"
+        testApplicationId "com.health.openscale.test"
         minSdkVersion 18
         targetSdkVersion 22 // don't set target sdk > 22 otherwise bluetooth le discovery need permission to ACCESS_COARSE_LOCATION
         versionCode 22
diff --git a/android_app/app/src/main/java/com/health/openscale/junit/DatabaseTest.java b/android_app/app/src/androidTest/java/com.health.openscale/DatabaseTest.java
similarity index 99%
rename from android_app/app/src/main/java/com/health/openscale/junit/DatabaseTest.java
rename to android_app/app/src/androidTest/java/com.health.openscale/DatabaseTest.java
index 6d926d39..ec74be40 100644
--- a/android_app/app/src/main/java/com/health/openscale/junit/DatabaseTest.java
+++ b/android_app/app/src/androidTest/java/com.health.openscale/DatabaseTest.java
@@ -13,7 +13,7 @@
 *    You should have received a copy of the GNU General Public License
 *    along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
-package com.health.openscale.junit;
+package com.health.openscale;
 
 import android.arch.persistence.room.Room;
 import android.content.Context;
diff --git a/android_app/app/src/main/java/com/health/openscale/junit/CsvHelperTest.java b/android_app/app/src/test/java/com.health.openscale/CsvHelperTest.java
similarity index 99%
rename from android_app/app/src/main/java/com/health/openscale/junit/CsvHelperTest.java
rename to android_app/app/src/test/java/com.health.openscale/CsvHelperTest.java
index 995a0473..d801bcb5 100644
--- a/android_app/app/src/main/java/com/health/openscale/junit/CsvHelperTest.java
+++ b/android_app/app/src/test/java/com.health.openscale/CsvHelperTest.java
@@ -14,7 +14,7 @@
 *    along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
-package com.health.openscale.junit;
+package com.health.openscale;
 
 import com.health.openscale.core.datatypes.ScaleMeasurement;
 import com.health.openscale.core.utils.CsvHelper;
diff --git a/android_app/app/src/main/java/com/health/openscale/junit/DateTimeHelpersTest.java b/android_app/app/src/test/java/com.health.openscale/DateTimeHelpersTest.java
similarity index 98%
rename from android_app/app/src/main/java/com/health/openscale/junit/DateTimeHelpersTest.java
rename to android_app/app/src/test/java/com.health.openscale/DateTimeHelpersTest.java
index 018cbd13..decabb39 100644
--- a/android_app/app/src/main/java/com/health/openscale/junit/DateTimeHelpersTest.java
+++ b/android_app/app/src/test/java/com.health.openscale/DateTimeHelpersTest.java
@@ -14,7 +14,7 @@
 *    along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
-package com.health.openscale.junit;
+package com.health.openscale;
 
 import com.health.openscale.core.utils.DateTimeHelpers;