diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index b86f2ba29..563812e2d 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -95,6 +95,16 @@ android {
             storePassword "notReal"
             keyPassword "notReal"
         }
+        debug {
+            def path = System.getenv("DEBUG_KEYSTORE_PATH")
+            if (! path) {
+                path = "./debug.keystore"
+            }
+            storeFile file(path)
+            keyAlias "androiddebugkey"
+            storePassword "android"
+            keyPassword "android"
+        }
     }
 
     buildTypes {
diff --git a/xwords4/android/scripts/debug.keystore b/xwords4/android/app/debug.keystore
similarity index 100%
rename from xwords4/android/scripts/debug.keystore
rename to xwords4/android/app/debug.keystore