diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/AndroidManifest.xml b/src/modules/audio_device/main/test/Android/audio_device_android_test/AndroidManifest.xml
deleted file mode 100644
index a0c91bce5f..0000000000
--- a/src/modules/audio_device/main/test/Android/audio_device_android_test/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="1"
-      android:versionName="1.0" package="org.webrtc.voiceengine.test">
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
-        <activity android:label="@string/app_name" android:name="AudioDeviceAndroidTest">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-    </application>
-
-
-<uses-sdk android:minSdkVersion="3"></uses-sdk>
-<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"></uses-permission>
-<uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
-</manifest> 
\ No newline at end of file
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/res/layout/main.xml b/src/modules/audio_device/main/test/Android/audio_device_android_test/res/layout/main.xml
deleted file mode 100644
index e7f54c65d6..0000000000
--- a/src/modules/audio_device/main/test/Android/audio_device_android_test/res/layout/main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-
-<Button android:text="@string/run_button" android:id="@+id/Button01" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-</LinearLayout>
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java b/src/modules/audio_device/main/test/Android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java
deleted file mode 100644
index f05f57910c..0000000000
--- a/src/modules/audio_device/main/test/Android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../source/Android/org/webrtc/voiceengine/AudioDeviceAndroid.java
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/.classpath b/src/modules/audio_device/main/test/android/audio_device_android_test/.classpath
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/.classpath
rename to src/modules/audio_device/main/test/android/audio_device_android_test/.classpath
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/.project b/src/modules/audio_device/main/test/android/audio_device_android_test/.project
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/.project
rename to src/modules/audio_device/main/test/android/audio_device_android_test/.project
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/AndroidManifest.xml b/src/modules/audio_device/main/test/android/audio_device_android_test/AndroidManifest.xml
new file mode 100644
index 0000000000..d8117f58aa
--- /dev/null
+++ b/src/modules/audio_device/main/test/android/audio_device_android_test/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	  android:versionCode="1"
+	  android:versionName="1.0" package="org.webrtc.voiceengine.test">
+  <application android:icon="@drawable/icon"
+	       android:label="@string/app_name"
+	       android:debuggable="true">
+    <activity android:label="@string/app_name"
+	      android:name="AudioDeviceAndroidTest">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+  <uses-sdk android:minSdkVersion="3"></uses-sdk>
+  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS">
+  </uses-permission>
+  <uses-permission android:name="android.permission.RECORD_AUDIO">
+  </uses-permission>
+</manifest> 
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/default.properties b/src/modules/audio_device/main/test/android/audio_device_android_test/default.properties
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/default.properties
rename to src/modules/audio_device/main/test/android/audio_device_android_test/default.properties
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java b/src/modules/audio_device/main/test/android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java
rename to src/modules/audio_device/main/test/android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/jni/audio_device_android_test.cc b/src/modules/audio_device/main/test/android/audio_device_android_test/jni/audio_device_android_test.cc
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/jni/audio_device_android_test.cc
rename to src/modules/audio_device/main/test/android/audio_device_android_test/jni/audio_device_android_test.cc
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h b/src/modules/audio_device/main/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h
rename to src/modules/audio_device/main/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/res/drawable/icon.png b/src/modules/audio_device/main/test/android/audio_device_android_test/res/drawable/icon.png
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/res/drawable/icon.png
rename to src/modules/audio_device/main/test/android/audio_device_android_test/res/drawable/icon.png
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/res/layout/main.xml b/src/modules/audio_device/main/test/android/audio_device_android_test/res/layout/main.xml
new file mode 100644
index 0000000000..6161f1d888
--- /dev/null
+++ b/src/modules/audio_device/main/test/android/audio_device_android_test/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	      android:orientation="vertical"
+	      android:layout_width="fill_parent"
+	      android:layout_height="fill_parent">
+
+  <Button android:text="@string/run_button"
+	  android:id="@+id/Button01"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content">
+  </Button>
+</LinearLayout>
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/res/values/strings.xml b/src/modules/audio_device/main/test/android/audio_device_android_test/res/values/strings.xml
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/res/values/strings.xml
rename to src/modules/audio_device/main/test/android/audio_device_android_test/res/values/strings.xml
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java b/src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java
new file mode 100644
index 0000000000..4863168980
--- /dev/null
+++ b/src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java
@@ -0,0 +1 @@
+../../../../../../../source/android/org/webrtc/voiceengine/AudioDeviceAndroid.java
diff --git a/src/modules/audio_device/main/test/Android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java b/src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java
similarity index 100%
rename from src/modules/audio_device/main/test/Android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java
rename to src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java