diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java
index 2eadd847055..39945603a8b 100644
--- a/src/com/android/settings/TestingSettings.java
+++ b/src/com/android/settings/TestingSettings.java
@@ -17,13 +17,15 @@
 package com.android.settings;
 
 import android.os.Bundle;
+import android.preference.PreferenceActivity;
 
-public class TestingSettings extends SettingsPreferenceFragment {
+public class TestingSettings extends PreferenceActivity {
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
         addPreferencesFromResource(R.xml.testing_settings);
     }
+
 }
diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java
index cdbb580277b..291a4959f8f 100644
--- a/src/com/android/settings/wifi/WifiInfo.java
+++ b/src/com/android/settings/wifi/WifiInfo.java
@@ -19,17 +19,18 @@ package com.android.settings.wifi;
 import com.android.settings.R;
 
 import android.os.Bundle;
-import com.android.settings.SettingsPreferenceFragment;
+import android.preference.PreferenceActivity;
 
 
 /**
  * Wifi information menu item on the diagnostic screen
  */
-public class WifiInfo extends SettingsPreferenceFragment {
+public class WifiInfo extends PreferenceActivity {
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.testing_wifi_settings);
     }
+
 }