diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
index bd1b47dec..8eae14c61 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
@@ -23,14 +23,19 @@ import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 
 import org.bouncycastle.util.encoders.Hex;
+import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
+import org.sufficientlysecure.keychain.ui.token.ManageSecurityTokenFragment;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 
 
@@ -48,6 +53,27 @@ public class CreateSecurityTokenWaitFragment extends Fragment {
         if (this.getActivity() instanceof BaseSecurityTokenActivity) {
             ((BaseSecurityTokenActivity) this.getActivity()).checkDeviceConnection();
         }
+
+        setHasOptionsMenu(BuildConfig.DEBUG);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.token_debug, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_token_debug_uri:
+                mCreateKeyActivity.loadFragment(
+                        ManageSecurityTokenFragment.newInstanceDebugUri(), FragAction.TO_RIGHT);
+                break;
+            case R.id.menu_token_debug_keyserver:
+                mCreateKeyActivity.loadFragment(
+                        ManageSecurityTokenFragment.newInstanceDebugKeyserver(), FragAction.TO_RIGHT);
+        }
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java
index a93d78303..60a438708 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java
@@ -37,6 +37,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import org.bouncycastle.util.encoders.Hex;
+import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
@@ -82,10 +83,23 @@ public class ManageSecurityTokenFragment extends Fragment implements ManageSecur
     private LayoutInflater layoutInflater;
     private StatusIndicator latestStatusIndicator;
 
-    public static Fragment newInstanceForDebug() {
-//        byte[] scannedFps = KeyFormattingUtils.convertFingerprintHexFingerprint("4700BA1AC417ABEF3CC7765AD686905837779C3E");
-        byte[] scannedFps = KeyFormattingUtils.convertFingerprintHexFingerprint("1efdb4845ca242ca6977fddb1f788094fd3b430a");
-        return newInstance(scannedFps, Hex.decode("010203040506"), "yubinu2@mugenguild.com", "http://valodim.stratum0.net/mryubinu3.asc");
+    public static Fragment newInstanceDebugKeyserver() {
+        if (!BuildConfig.DEBUG) {
+            throw new UnsupportedOperationException("This operation is only available in debug builds!");
+        }
+        byte[] scannedFps =
+                KeyFormattingUtils.convertFingerprintHexFingerprint("1efdb4845ca242ca6977fddb1f788094fd3b430a");
+        return newInstance(scannedFps, Hex.decode("010203040506"), "yubinu2@mugenguild.com", null);
+    }
+
+    public static Fragment newInstanceDebugUri() {
+        if (!BuildConfig.DEBUG) {
+            throw new UnsupportedOperationException("This operation is only available in debug builds!");
+        }
+        byte[] scannedFps =
+                KeyFormattingUtils.convertFingerprintHexFingerprint("4700BA1AC417ABEF3CC7765AD686905837779C3E");
+        return newInstance(scannedFps, Hex.decode("010203040506"), "yubinu2@mugenguild.com",
+                "http://valodim.stratum0.net/mryubinu2.asc");
     }
 
     public static Fragment newInstance(byte[] scannedFingerprints, byte[] nfcAid, String userId, String tokenUrl) {
diff --git a/OpenKeychain/src/main/res/menu/token_debug.xml b/OpenKeychain/src/main/res/menu/token_debug.xml
new file mode 100644
index 000000000..e694799ee
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/token_debug.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:title="Debug / Token from Keyserver"
+        android:id="@+id/menu_token_debug_keyserver"
+        />
+    <item
+        android:title="Debug / Token from Uri"
+        android:id="@+id/menu_token_debug_uri"
+        />
+</menu>
\ No newline at end of file