diff --git a/app/src/debug/java/org/tasks/preferences/DebugPreferences.java b/app/src/debug/java/org/tasks/preferences/DebugPreferences.java
new file mode 100644
index 000000000..de5be9f6c
--- /dev/null
+++ b/app/src/debug/java/org/tasks/preferences/DebugPreferences.java
@@ -0,0 +1,21 @@
+package org.tasks.preferences;
+
+import android.os.Bundle;
+import org.tasks.R;
+import org.tasks.injection.ActivityComponent;
+import org.tasks.injection.InjectingPreferenceActivity;
+
+public class DebugPreferences extends InjectingPreferenceActivity {
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    addPreferencesFromResource(R.xml.preferences_debug);
+  }
+
+  @Override
+  public void inject(ActivityComponent component) {
+    component.inject(this);
+  }
+}
diff --git a/app/src/debug/res/xml/preferences_debug.xml b/app/src/debug/res/xml/preferences_debug.xml
new file mode 100644
index 000000000..dd67e94e9
--- /dev/null
+++ b/app/src/debug/res/xml/preferences_debug.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <CheckBoxPreference
+    android:key="@string/p_leak_canary"
+    android:title="@string/debug_leak_canary" />
+
+  <CheckBoxPreference
+    android:key="@string/p_strict_mode"
+    android:title="@string/debug_strict_mode"/>
+
+  <CheckBoxPreference
+    android:key="@string/p_debug_pro"
+    android:title="@string/debug_pro" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d2382b86..72d3a4118 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -498,6 +498,11 @@
 
     </activity>
 
+    <activity
+      android:label="@string/debug"
+      android:name=".preferences.DebugPreferences"
+      android:theme="@style/Tasks"/>
+
     <!-- launcher icons -->
 
     <activity-alias
diff --git a/app/src/main/java/org/tasks/injection/ActivityComponent.java b/app/src/main/java/org/tasks/injection/ActivityComponent.java
index 81ba6b447..3e4acb54e 100644
--- a/app/src/main/java/org/tasks/injection/ActivityComponent.java
+++ b/app/src/main/java/org/tasks/injection/ActivityComponent.java
@@ -32,6 +32,7 @@ import org.tasks.locale.ui.activity.TaskerSettingsActivity;
 import org.tasks.preferences.AppearancePreferences;
 import org.tasks.preferences.BasicPreferences;
 import org.tasks.preferences.DateTimePreferences;
+import org.tasks.preferences.DebugPreferences;
 import org.tasks.preferences.MiscellaneousPreferences;
 import org.tasks.reminders.NotificationActivity;
 import org.tasks.reminders.SnoozeActivity;
@@ -131,4 +132,6 @@ public interface ActivityComponent {
   void inject(CaldavAccountSettingsActivity caldavAccountSettingsActivity);
 
   void inject(DriveLoginActivity driveLoginActivity);
+
+  void inject(DebugPreferences debugPreferences);
 }
diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
index 0c1550580..d87774696 100644
--- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
@@ -79,13 +79,11 @@ public class BasicPreferences extends InjectingPreferenceActivity
     result = savedInstanceState == null ? new Bundle() : savedInstanceState.getBundle(EXTRA_RESULT);
 
     addPreferencesFromResource(R.xml.preferences);
-    if (BuildConfig.DEBUG) {
-      addPreferencesFromResource(R.xml.preferences_debug);
-    }
 
     setupActivity(R.string.EPr_appearance_header, AppearancePreferences.class);
     setupActivity(R.string.notifications, ReminderPreferences.class);
     setupActivity(R.string.EPr_manage_header, OldTaskPreferences.class);
+    setupActivity(R.string.debug, DebugPreferences.class);
 
     Preference themePreference = findPreference(getString(R.string.p_theme));
     themePreference.setSummary(themeBase.getName());
@@ -196,6 +194,8 @@ public class BasicPreferences extends InjectingPreferenceActivity
         R.string.p_language,
         R.string.p_layout_direction);
 
+    requires(BuildConfig.DEBUG, R.string.debug);
+
     //noinspection ConstantConditions
     if (!BuildConfig.FLAVOR.equals("googleplay")) {
       requires(R.string.backup_BPr_header, false, R.string.p_google_drive_backup);
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 8d3f3b2eb..16edb7424 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -151,4 +151,8 @@
 
   </PreferenceCategory>
 
+  <Preference
+    android:key="@string/debug"
+    android:title="@string/debug"/>
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_debug.xml b/app/src/main/res/xml/preferences_debug.xml
deleted file mode 100644
index f0394ddfa..000000000
--- a/app/src/main/res/xml/preferences_debug.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <PreferenceCategory
-    android:title="@string/debug">
-
-    <CheckBoxPreference
-      android:key="@string/p_leak_canary"
-      android:title="@string/debug_leak_canary" />
-
-    <CheckBoxPreference
-      android:key="@string/p_strict_mode"
-      android:title="@string/debug_strict_mode"/>
-
-    <CheckBoxPreference
-      android:key="@string/p_debug_pro"
-      android:title="@string/debug_pro" />
-
-  </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/release/java/org/tasks/preferences/DebugPreferences.java b/app/src/release/java/org/tasks/preferences/DebugPreferences.java
new file mode 100644
index 000000000..b069ccdda
--- /dev/null
+++ b/app/src/release/java/org/tasks/preferences/DebugPreferences.java
@@ -0,0 +1,7 @@
+package org.tasks.preferences;
+
+import android.app.Activity;
+
+public class DebugPreferences extends Activity {
+
+}