diff --git a/src/voice_engine/main/test/Android/android_test/AndroidManifest.xml b/src/voice_engine/main/test/Android/android_test/AndroidManifest.xml
deleted file mode 100644
index 76e2e34500..0000000000
--- a/src/voice_engine/main/test/Android/android_test/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2011 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.        -->
-
-<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:name=".AndroidTest"
-                  android:label="@string/app_name"
-                  android:screenOrientation="portrait">
-            <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-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-	<uses-permission android:name="android.permission.RECORD_AUDIO" />
-	<uses-permission android:name="android.permission.INTERNET" />
-
-</manifest> 
diff --git a/src/voice_engine/main/test/Android/android_test/res/layout/main.xml b/src/voice_engine/main/test/Android/android_test/res/layout/main.xml
deleted file mode 100644
index c2423c81e8..0000000000
--- a/src/voice_engine/main/test/Android/android_test/res/layout/main.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2011 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.        -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-
-<TextView android:text="@+id/TextView01" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
-<EditText android:text="@+id/EditText01" android:id="@+id/EditText01" android:layout_width="wrap_content" android:layout_height="wrap_content"></EditText><Button android:text="@+id/Button01" android:id="@+id/Button01" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-
-
-<Spinner android:id="@+id/Spinner01" android:layout_width="wrap_content" android:layout_height="wrap_content"></Spinner>
-<Spinner android:id="@+id/Spinner02" android:layout_width="wrap_content" android:layout_height="wrap_content"></Spinner><Button android:text="@+id/Button02" android:id="@+id/Button02" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-</LinearLayout>
diff --git a/src/voice_engine/main/test/Android/android_test/.classpath b/src/voice_engine/main/test/android/android_test/.classpath
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/.classpath
rename to src/voice_engine/main/test/android/android_test/.classpath
diff --git a/src/voice_engine/main/test/Android/android_test/.project b/src/voice_engine/main/test/android/android_test/.project
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/.project
rename to src/voice_engine/main/test/android/android_test/.project
diff --git a/src/voice_engine/main/test/android/android_test/AndroidManifest.xml b/src/voice_engine/main/test/android/android_test/AndroidManifest.xml
new file mode 100644
index 0000000000..a614f8dd13
--- /dev/null
+++ b/src/voice_engine/main/test/android/android_test/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2011 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.        -->
+
+<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:name=".AndroidTest"
+              android:label="@string/app_name"
+              android:screenOrientation="portrait">
+      <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-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+  <uses-permission android:name="android.permission.RECORD_AUDIO" />
+  <uses-permission android:name="android.permission.INTERNET" />
+
+</manifest> 
diff --git a/src/voice_engine/main/test/Android/android_test/default.properties b/src/voice_engine/main/test/android/android_test/default.properties
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/default.properties
rename to src/voice_engine/main/test/android/android_test/default.properties
diff --git a/src/voice_engine/main/test/Android/android_test/gen/org/webrtc/voiceengine/test/R.java b/src/voice_engine/main/test/android/android_test/gen/org/webrtc/voiceengine/test/R.java
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/gen/org/webrtc/voiceengine/test/R.java
rename to src/voice_engine/main/test/android/android_test/gen/org/webrtc/voiceengine/test/R.java
diff --git a/src/voice_engine/main/test/Android/android_test/jni/Android.mk b/src/voice_engine/main/test/android/android_test/jni/Android.mk
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/jni/Android.mk
rename to src/voice_engine/main/test/android/android_test/jni/Android.mk
diff --git a/src/voice_engine/main/test/Android/android_test/jni/android_test.cc b/src/voice_engine/main/test/android/android_test/jni/android_test.cc
similarity index 99%
rename from src/voice_engine/main/test/Android/android_test/jni/android_test.cc
rename to src/voice_engine/main/test/android/android_test/jni/android_test.cc
index 04139bade2..2742b14982 100644
--- a/src/voice_engine/main/test/Android/android_test/jni/android_test.cc
+++ b/src/voice_engine/main/test/android/android_test/jni/android_test.cc
@@ -799,7 +799,7 @@ JNIEXPORT jint JNICALL Java_org_webrtc_voiceengine_test_AndroidTest_StartSend(
      return -1;
      } */
 
-    /*	if (veData1.rtp_rtcp->SetFECStatus(channel, 1) != 0)
+    /* if (veData1.rtp_rtcp->SetFECStatus(channel, 1) != 0)
      {
      __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG,
          "Failed to enable FEC");
@@ -867,7 +867,7 @@ JNIEXPORT jint JNICALL Java_org_webrtc_voiceengine_test_AndroidTest_StopSend(
         jobject,
         jint channel)
 {
-    /*	if (veData1.rtp_rtcp->SetFECStatus(channel, 0) != 0)
+    /* if (veData1.rtp_rtcp->SetFECStatus(channel, 0) != 0)
      {
      __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG,
          "Failed to disable FEC");
@@ -1037,7 +1037,7 @@ Java_org_webrtc_voiceengine_test_AndroidTest_SetAGCStatus(
             break;
     }
 
-    /*	AgcConfig agcConfig;
+    /* AgcConfig agcConfig;
      agcConfig.targetLeveldBOv = 3;
      agcConfig.digitalCompressionGaindB = 50;
      agcConfig.limiterEnable = 0;
diff --git a/src/voice_engine/main/test/Android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h b/src/voice_engine/main/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h
rename to src/voice_engine/main/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h
diff --git a/src/voice_engine/main/test/Android/android_test/res/drawable/icon.png b/src/voice_engine/main/test/android/android_test/res/drawable/icon.png
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/res/drawable/icon.png
rename to src/voice_engine/main/test/android/android_test/res/drawable/icon.png
diff --git a/src/voice_engine/main/test/android/android_test/res/layout/main.xml b/src/voice_engine/main/test/android/android_test/res/layout/main.xml
new file mode 100644
index 0000000000..4165a07c39
--- /dev/null
+++ b/src/voice_engine/main/test/android/android_test/res/layout/main.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2011 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.        -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	      android:orientation="vertical"
+	      android:layout_width="fill_parent"
+	      android:layout_height="fill_parent">
+
+  <TextView android:text="@+id/TextView01"
+	    android:id="@+id/TextView01"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content">
+  </TextView>
+  <EditText android:text="@+id/EditText01"
+	    android:id="@+id/EditText01"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content">
+  </EditText>
+  <Button android:text="@+id/Button01"
+	  android:id="@+id/Button01"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content">
+  </Button>
+  <Spinner android:id="@+id/Spinner01"
+	   android:layout_width="wrap_content"
+	   android:layout_height="wrap_content">
+  </Spinner>
+  <Spinner android:id="@+id/Spinner02"
+	   android:layout_width="wrap_content"
+	   android:layout_height="wrap_content">
+  </Spinner>
+  <Button android:text="@+id/Button02"
+	  android:id="@+id/Button02"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content">
+  </Button>
+</LinearLayout>
diff --git a/src/voice_engine/main/test/Android/android_test/res/values/strings.xml b/src/voice_engine/main/test/android/android_test/res/values/strings.xml
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/res/values/strings.xml
rename to src/voice_engine/main/test/android/android_test/res/values/strings.xml
diff --git a/src/voice_engine/main/test/Android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java b/src/voice_engine/main/test/android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java
similarity index 100%
rename from src/voice_engine/main/test/Android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java
rename to src/voice_engine/main/test/android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java