diff --git a/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java
index bb0fa6007808f..2c8c5ba4cef6d 100644
--- a/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java
+++ b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java
@@ -46,14 +46,22 @@ public class AppWidgetHostActivity extends Activity
     AppWidgetContainerView mAppWidgetContainer;
 
     public AppWidgetHostActivity() {
-        mAppWidgetManager = AppWidgetManager.getInstance(this);
     }
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mAppWidgetManager = AppWidgetManager.getInstance(this);
+
         setContentView(R.layout.appwidget_host);
 
+        mHost = new AppWidgetHost(this, HOST_ID) {
+                protected AppWidgetHostView onCreateView(Context context, int appWidgetId, AppWidgetProviderInfo appWidget) {
+                    return new MyAppWidgetView(appWidgetId);
+                }
+            };
+
+
         findViewById(R.id.add_appwidget).setOnClickListener(mOnClickListener);
         mAppWidgetContainer = (AppWidgetContainerView)findViewById(R.id.appwidget_container);
 
@@ -188,11 +196,7 @@ public class AppWidgetHostActivity extends Activity
         }
     }
 
-    AppWidgetHost mHost = new AppWidgetHost(this, HOST_ID) {
-        protected AppWidgetHostView onCreateView(Context context, int appWidgetId, AppWidgetProviderInfo appWidget) {
-            return new MyAppWidgetView(appWidgetId);
-        }
-    };
+    AppWidgetHost mHost;
 }