diff --git a/src/video_engine/main/test/android_test/Android.mk b/src/video_engine/main/test/android_test/Android.mk
deleted file mode 100644
index c69391181f..0000000000
--- a/src/video_engine/main/test/android_test/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-#
-#  Use of this source code is governed by a BSD-style license
-#  that can be found in the LICENSE file in the root of the source
-#  tree. An additional intellectual property rights grant can be found
-#  in the file PATENTS.  All contributing project authors may
-#  be found in the AUTHORS file in the root of the source tree.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := \
-    src/org/webrtc/videoengineapp/WebRTCDemo.java \
-    src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java \
-    src/org/webrtc/videoengineapp/IViEAndroidCallback.java \
-    src/org/webrtc/videoengine/CaptureCapabilityAndroid.java \
-    src/org/webrtc/videoengine/VideoCaptureAndroid.java \
-    src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java \
-    src/org/webrtc/videoengine/ViEAndroidGLES20.java \
-    src/org/webrtc/videoengine/ViERenderer.java \
-    src/org/webrtc/videoengine/ViESurfaceRenderer.java \
-    src/org/webrtc/voiceengine/WebRTCAudioDevice.java
-
-LOCAL_PACKAGE_NAME := webrtc-video-demo
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES := libwebrtc-video-demo-jni
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/src/video_engine/main/test/android_test/AndroidManifest.xml b/src/video_engine/test/android/AndroidManifest.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/AndroidManifest.xml
rename to src/video_engine/test/android/AndroidManifest.xml
diff --git a/src/video_engine/main/test/android_test/build.xml b/src/video_engine/test/android/build.xml
similarity index 99%
rename from src/video_engine/main/test/android_test/build.xml
rename to src/video_engine/test/android/build.xml
index 6507169c3e..b378a7a689 100644
--- a/src/video_engine/main/test/android_test/build.xml
+++ b/src/video_engine/test/android/build.xml
@@ -883,7 +883,7 @@ Notice for all the files in this folder.
                 <path refid="project.all.jars.path" />
                 <path refid="tested.project.classpath" />
             </path>
-            <property name="webrtc.modules.dir" value="../../../../modules" />
+            <property name="webrtc.modules.dir" value="../../../modules" />
             <javac encoding="${java.encoding}"
                     source="${java.source}" target="${java.target}"
                     debug="true" extdirs="" includeantruntime="false"
diff --git a/src/video_engine/main/test/android_test/jni/Android.mk b/src/video_engine/test/android/jni/Android.mk
similarity index 97%
rename from src/video_engine/main/test/android_test/jni/Android.mk
rename to src/video_engine/test/android/jni/Android.mk
index 1c17312335..15ec8a0e05 100644
--- a/src/video_engine/main/test/android_test/jni/Android.mk
+++ b/src/video_engine/test/android/jni/Android.mk
@@ -8,7 +8,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-MY_LIBS_PATH := ../../../../../../out/Debug/obj.target
+MY_LIBS_PATH := ../../../../../out/Debug/obj.target
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libvoice_engine_core
@@ -261,9 +261,9 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     external/gtest/include \
-    $(LOCAL_PATH)/../../../../.. \
-    $(LOCAL_PATH)/../../../../include \
-    $(LOCAL_PATH)/../../../../../voice_engine/include
+    $(LOCAL_PATH)/../../../.. \
+    $(LOCAL_PATH)/../../../include \
+    $(LOCAL_PATH)/../../../../voice_engine/include
 
 LOCAL_LDLIBS := \
     -llog \
diff --git a/src/video_engine/main/test/android_test/jni/Application.mk b/src/video_engine/test/android/jni/Application.mk
similarity index 100%
rename from src/video_engine/main/test/android_test/jni/Application.mk
rename to src/video_engine/test/android/jni/Application.mk
diff --git a/src/video_engine/main/test/android_test/jni/org_webrtc_videoengineapp_vie_android_java_api.h b/src/video_engine/test/android/jni/org_webrtc_videoengineapp_vie_android_java_api.h
similarity index 100%
rename from src/video_engine/main/test/android_test/jni/org_webrtc_videoengineapp_vie_android_java_api.h
rename to src/video_engine/test/android/jni/org_webrtc_videoengineapp_vie_android_java_api.h
diff --git a/src/video_engine/main/test/android_test/jni/vie_android_java_api.cc b/src/video_engine/test/android/jni/vie_android_java_api.cc
similarity index 100%
rename from src/video_engine/main/test/android_test/jni/vie_android_java_api.cc
rename to src/video_engine/test/android/jni/vie_android_java_api.cc
diff --git a/src/video_engine/main/test/android_test/project.properties b/src/video_engine/test/android/project.properties
similarity index 100%
rename from src/video_engine/main/test/android_test/project.properties
rename to src/video_engine/test/android/project.properties
diff --git a/src/video_engine/main/test/android_test/res/drawable/logo.png b/src/video_engine/test/android/res/drawable/logo.png
similarity index 100%
rename from src/video_engine/main/test/android_test/res/drawable/logo.png
rename to src/video_engine/test/android/res/drawable/logo.png
diff --git a/src/video_engine/main/test/android_test/res/layout/aconfig.xml b/src/video_engine/test/android/res/layout/aconfig.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/res/layout/aconfig.xml
rename to src/video_engine/test/android/res/layout/aconfig.xml
diff --git a/src/video_engine/main/test/android_test/res/layout/both.xml b/src/video_engine/test/android/res/layout/both.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/res/layout/both.xml
rename to src/video_engine/test/android/res/layout/both.xml
diff --git a/src/video_engine/main/test/android_test/res/layout/main.xml b/src/video_engine/test/android/res/layout/main.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/res/layout/main.xml
rename to src/video_engine/test/android/res/layout/main.xml
diff --git a/src/video_engine/main/test/android_test/res/layout/row.xml b/src/video_engine/test/android/res/layout/row.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/res/layout/row.xml
rename to src/video_engine/test/android/res/layout/row.xml
diff --git a/src/video_engine/main/test/android_test/res/layout/send.xml b/src/video_engine/test/android/res/layout/send.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/res/layout/send.xml
rename to src/video_engine/test/android/res/layout/send.xml
diff --git a/src/video_engine/main/test/android_test/res/layout/tabhost.xml b/src/video_engine/test/android/res/layout/tabhost.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/res/layout/tabhost.xml
rename to src/video_engine/test/android/res/layout/tabhost.xml
diff --git a/src/video_engine/main/test/android_test/res/layout/vconfig.xml b/src/video_engine/test/android/res/layout/vconfig.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/res/layout/vconfig.xml
rename to src/video_engine/test/android/res/layout/vconfig.xml
diff --git a/src/video_engine/main/test/android_test/res/values/strings.xml b/src/video_engine/test/android/res/values/strings.xml
similarity index 100%
rename from src/video_engine/main/test/android_test/res/values/strings.xml
rename to src/video_engine/test/android/res/values/strings.xml
diff --git a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/IViEAndroidCallback.java b/src/video_engine/test/android/src/org/webrtc/videoengineapp/IViEAndroidCallback.java
similarity index 100%
rename from src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/IViEAndroidCallback.java
rename to src/video_engine/test/android/src/org/webrtc/videoengineapp/IViEAndroidCallback.java
diff --git a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java b/src/video_engine/test/android/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java
similarity index 100%
rename from src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java
rename to src/video_engine/test/android/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java
diff --git a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java b/src/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java
similarity index 100%
rename from src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java
rename to src/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java