diff --git a/test/src/org/apache/cordova/test/BackButtonTest.java b/test/src/org/apache/cordova/test/BackButtonTest.java
new file mode 100644
index 00000000..db09792f
--- /dev/null
+++ b/test/src/org/apache/cordova/test/BackButtonTest.java
@@ -0,0 +1,49 @@
+package org.apache.cordova.test;
+
+import org.apache.cordova.CordovaWebView;
+
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.TouchUtils;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+public class BackButtonTest extends ActivityInstrumentationTestCase2<backbuttonmultipage> {
+
+  private backbuttonmultipage testActivity;
+  private FrameLayout containerView;
+  private LinearLayout innerContainer;
+  private CordovaWebView testView;
+  private TouchUtils touchTest;
+  private long TIMEOUT = 5000;
+  
+  public BackButtonTest() {
+    super("org.apache.cordova.test",backbuttonmultipage.class);
+  }
+
+  protected void setUp() throws Exception {
+    super.setUp();
+    testActivity = this.getActivity();
+    containerView = (FrameLayout) testActivity.findViewById(android.R.id.content);
+    innerContainer = (LinearLayout) containerView.getChildAt(0);
+    testView = (CordovaWebView) innerContainer.getChildAt(0);
+    touchTest = new TouchUtils();
+  }
+  
+  public void testPreconditions(){
+    assertNotNull(innerContainer);
+    assertNotNull(testView);
+  }
+
+  public void testClick() {
+    touchTest.tapView(this, testView);
+  }
+  
+  private void sleep() {
+    try {
+      Thread.sleep(TIMEOUT );
+    } catch (InterruptedException e) {
+      fail("Unexpected Timeout");
+    }
+  }
+
+}
diff --git a/test/src/org/apache/cordova/test/CordovaActivityTest.java b/test/src/org/apache/cordova/test/CordovaActivityTest.java
index 8a38b1ad..3a5b47db 100644
--- a/test/src/org/apache/cordova/test/CordovaActivityTest.java
+++ b/test/src/org/apache/cordova/test/CordovaActivityTest.java
@@ -33,9 +33,10 @@ public class CordovaActivityTest extends ActivityInstrumentationTestCase2<PhoneG
     private LinearLayout innerContainer;
     private CordovaWebView testView;
     
+    @SuppressWarnings("deprecation")
     public CordovaActivityTest()
     {
-        super("com.phonegap.test.activities",PhoneGapActivity.class);
+        super("org.apache.cordova.test",PhoneGapActivity.class);
     }
     
     protected void setUp() throws Exception {
diff --git a/test/src/org/apache/cordova/test/ErrorUrlTest.java b/test/src/org/apache/cordova/test/ErrorUrlTest.java
new file mode 100644
index 00000000..74a35c7d
--- /dev/null
+++ b/test/src/org/apache/cordova/test/ErrorUrlTest.java
@@ -0,0 +1,35 @@
+package org.apache.cordova.test;
+
+import org.apache.cordova.CordovaWebView;
+
+import android.test.ActivityInstrumentationTestCase2;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+public class ErrorUrlTest extends ActivityInstrumentationTestCase2<errorurl> {
+
+  errorurl testActivity;
+  private FrameLayout containerView;
+  private LinearLayout innerContainer;
+  private CordovaWebView testView;
+  
+  public ErrorUrlTest() {
+    super("org.apache.cordova.test",errorurl.class);
+  }
+  
+  
+  protected void setUp() throws Exception {
+      super.setUp();
+      testActivity = this.getActivity();
+      containerView = (FrameLayout) testActivity.findViewById(android.R.id.content);
+      innerContainer = (LinearLayout) containerView.getChildAt(0);
+      testView = (CordovaWebView) innerContainer.getChildAt(0);
+      
+  }
+  
+  public void testPreconditions(){
+      assertNotNull(innerContainer);
+      assertNotNull(testView);
+  }
+  
+}
diff --git a/test/src/org/apache/cordova/test/HtmlNotFoundTest.java b/test/src/org/apache/cordova/test/HtmlNotFoundTest.java
new file mode 100644
index 00000000..4546e5ac
--- /dev/null
+++ b/test/src/org/apache/cordova/test/HtmlNotFoundTest.java
@@ -0,0 +1,11 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class HtmlNotFoundTest extends ActivityInstrumentationTestCase2<htmlnotfound> {
+
+  
+  public HtmlNotFoundTest() {
+    super("org.apache.cordova.test",htmlnotfound.class);
+  }
+}
diff --git a/test/src/org/apache/cordova/test/IFrameTest.java b/test/src/org/apache/cordova/test/IFrameTest.java
new file mode 100644
index 00000000..07fba57a
--- /dev/null
+++ b/test/src/org/apache/cordova/test/IFrameTest.java
@@ -0,0 +1,11 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class IFrameTest extends ActivityInstrumentationTestCase2<iframe> {
+  
+  public IFrameTest() {
+    super("org.apache.cordova.test",iframe.class);
+  }
+
+}
diff --git a/test/src/org/apache/cordova/test/JQMTabTest.java b/test/src/org/apache/cordova/test/JQMTabTest.java
new file mode 100644
index 00000000..aa698256
--- /dev/null
+++ b/test/src/org/apache/cordova/test/JQMTabTest.java
@@ -0,0 +1,12 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class JQMTabTest extends ActivityInstrumentationTestCase2<jqmtabbackbutton> {
+
+  public JQMTabTest(Class<jqmtabbackbutton> activityClass) {
+    super(activityClass);
+    // TODO Auto-generated constructor stub
+  }
+
+}
diff --git a/test/src/org/apache/cordova/test/LifecycleTest.java b/test/src/org/apache/cordova/test/LifecycleTest.java
new file mode 100644
index 00000000..f9ff9308
--- /dev/null
+++ b/test/src/org/apache/cordova/test/LifecycleTest.java
@@ -0,0 +1,11 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class LifecycleTest extends ActivityInstrumentationTestCase2<lifecycle> {
+  
+  public LifecycleTest()
+  {
+    super("org.apache.cordova.test",lifecycle.class);
+  }
+}
diff --git a/test/src/org/apache/cordova/test/LoadTimeoutTest.java b/test/src/org/apache/cordova/test/LoadTimeoutTest.java
new file mode 100644
index 00000000..e1610589
--- /dev/null
+++ b/test/src/org/apache/cordova/test/LoadTimeoutTest.java
@@ -0,0 +1,10 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class LoadTimeoutTest extends ActivityInstrumentationTestCase2<loading> {
+  public LoadTimeoutTest()
+  {
+    super("org.apache.cordova.test",loading.class);
+  }
+}
diff --git a/test/src/org/apache/cordova/test/SplashscreenTest.java b/test/src/org/apache/cordova/test/SplashscreenTest.java
new file mode 100644
index 00000000..2935991a
--- /dev/null
+++ b/test/src/org/apache/cordova/test/SplashscreenTest.java
@@ -0,0 +1,12 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class SplashscreenTest extends ActivityInstrumentationTestCase2<splashscreen> {
+  
+  public SplashscreenTest()
+  {
+      super("org.apache.cordova.test",splashscreen.class);
+  }
+
+}
diff --git a/test/src/org/apache/cordova/test/UserWebViewTest.java b/test/src/org/apache/cordova/test/UserWebViewTest.java
new file mode 100644
index 00000000..a3f82d86
--- /dev/null
+++ b/test/src/org/apache/cordova/test/UserWebViewTest.java
@@ -0,0 +1,11 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class UserWebViewTest extends ActivityInstrumentationTestCase2<userwebview> {
+
+  public UserWebViewTest ()
+  {
+    super(userwebview.class);
+  }
+}
diff --git a/test/src/org/apache/cordova/test/WhitelistTest.java b/test/src/org/apache/cordova/test/WhitelistTest.java
new file mode 100644
index 00000000..f3477c46
--- /dev/null
+++ b/test/src/org/apache/cordova/test/WhitelistTest.java
@@ -0,0 +1,12 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class WhitelistTest extends ActivityInstrumentationTestCase2<whitelist> {
+  
+  public WhitelistTest()
+  {
+    super(whitelist.class);
+  }
+
+}
diff --git a/test/src/org/apache/cordova/test/XhrTest.java b/test/src/org/apache/cordova/test/XhrTest.java
new file mode 100644
index 00000000..bc86138f
--- /dev/null
+++ b/test/src/org/apache/cordova/test/XhrTest.java
@@ -0,0 +1,11 @@
+package org.apache.cordova.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class XhrTest extends ActivityInstrumentationTestCase2<xhr> {
+
+  public XhrTest()
+  {
+    super(xhr.class);
+  }
+}
diff --git a/test/src/org/apache/cordova/test/errorurl.java b/test/src/org/apache/cordova/test/errorurl.java
index b30a4441..48e6ada0 100755
--- a/test/src/org/apache/cordova/test/errorurl.java
+++ b/test/src/org/apache/cordova/test/errorurl.java
@@ -29,4 +29,6 @@ public class errorurl extends DroidGap {
         this.setStringProperty("errorUrl", "file:///android_asset/www/htmlnotfound/error.html");
         super.loadUrl("file:///android_asset/www/htmlnotfound/index.html");
     }
+    
+    
 }