diff --git a/app/build.gradle b/app/build.gradle
index a916751f..1194fd45 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,6 +12,9 @@ android {
         versionName "1.0"
     }
     buildTypes {
+        debug {
+            applicationIdSuffix ".debug"
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
diff --git a/app/src/main/java/me/impy/aegis/db/DatabaseManager.java b/app/src/main/java/me/impy/aegis/db/DatabaseManager.java
index 8e372f0f..b05c4fd6 100644
--- a/app/src/main/java/me/impy/aegis/db/DatabaseManager.java
+++ b/app/src/main/java/me/impy/aegis/db/DatabaseManager.java
@@ -10,6 +10,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 
+import me.impy.aegis.BuildConfig;
 import me.impy.aegis.crypto.CryptParameters;
 import me.impy.aegis.crypto.CryptResult;
 import me.impy.aegis.crypto.MasterKey;
@@ -108,7 +109,8 @@ public class DatabaseManager {
         File file;
         FileOutputStream stream = null;
         try {
-            File dir = new File(Environment.getExternalStorageDirectory(), "Aegis");
+            String dirName = !BuildConfig.DEBUG ? "Aegis" : "AegisDebug";
+            File dir = new File(Environment.getExternalStorageDirectory(), dirName);
             if (!dir.exists() && !dir.mkdirs()) {
                 throw new IOException("error creating external storage directory");
             }