diff --git a/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java b/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
index fc94676b..1eebadb7 100644
--- a/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
+++ b/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
@@ -33,13 +33,11 @@ public class CordovaActivityTest extends BaseCordovaIntegrationTest {
     protected void setUp() throws Exception {
         super.setUp();
         setUpWithStartUrl(null);
-        innerContainer = (ViewGroup)containerView.getChildAt(0);
-        testView = innerContainer.getChildAt(0);
+        testView = (ViewGroup)containerView.getChildAt(0);
     }
 
     public void testBasicLoad() throws Exception {
         assertTrue(testView instanceof SystemWebView);
-        assertTrue(innerContainer instanceof LinearLayout);
         assertTrue(((CordovaWebViewEngine.EngineView)testView).getCordovaWebView() != null);
         String onPageFinishedUrl = testActivity.onPageFinishedUrl.take();
         assertEquals(MainTestActivity.START_URL, onPageFinishedUrl);
diff --git a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
index 7664d428..5df5cbac 100644
--- a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
+++ b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
@@ -22,6 +22,7 @@ package org.apache.cordova.test;
 import java.util.concurrent.ArrayBlockingQueue;
 
 import org.apache.cordova.Config;
+import org.apache.cordova.ConfigXmlParser;
 import org.apache.cordova.CordovaInterfaceImpl;
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.CordovaWebViewImpl;
@@ -55,12 +56,13 @@ public class CordovaWebViewTestActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
-        //CB-7238: This has to be added now, because it got removed from somewhere else
-        Config.init(this);
+
+        //Set up the webview
+        ConfigXmlParser parser = new ConfigXmlParser();
 
         SystemWebView webView = (SystemWebView) findViewById(R.id.cordovaWebView);
         cordovaWebView = new CordovaWebViewImpl(this, new SystemWebViewEngine(webView));
-        cordovaWebView.init(cordovaInterface, Config.getPluginEntries(), Config.getPreferences());
+        cordovaWebView.init(cordovaInterface, parser.getPluginEntries(), parser.getPreferences());
 
         cordovaWebView.loadUrl(START_URL);
     }