diff --git a/wpadebug/res/layout/main.xml b/wpadebug/res/layout/main.xml
index 6fdd565bb..cbdbfb961 100644
--- a/wpadebug/res/layout/main.xml
+++ b/wpadebug/res/layout/main.xml
@@ -116,6 +116,30 @@
 		    android:onClick="runCommands"
 		    />
 	</LinearLayout>
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		      android:layout_width="match_parent"
+		      android:layout_height="wrap_content"
+		      android:orientation="horizontal"
+		      >
+		<Button
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:text="QR Scan"
+		    android:onClick="runQrScan"
+		    />
+		<Button
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:text="QR Input"
+		    android:onClick="runQrInput"
+		    />
+		<Button
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:text="QR Display"
+		    android:onClick="runQrDisplay"
+		    />
+	</LinearLayout>
 	<TextView
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
diff --git a/wpadebug/src/w1/fi/wpadebug/MainActivity.java b/wpadebug/src/w1/fi/wpadebug/MainActivity.java
index c5d123e32..4c37b481f 100644
--- a/wpadebug/src/w1/fi/wpadebug/MainActivity.java
+++ b/wpadebug/src/w1/fi/wpadebug/MainActivity.java
@@ -47,6 +47,24 @@ public class MainActivity extends Activity
 	startActivity(intent);
     }
 
+    public void runQrScan(View view)
+    {
+	Intent intent = new Intent(this, QrCodeScannerActivity.class);
+	startActivity(intent);
+    }
+
+    public void runQrInput(View view)
+    {
+	Intent intent = new Intent(this, InputUri.class);
+	startActivity(intent);
+    }
+
+    public void runQrDisplay(View view)
+    {
+	Intent intent = new Intent(this, QrCodeDisplayActivity.class);
+	startActivity(intent);
+    }
+
     public void runWpaCommands(View view)
     {
 	Intent intent = new Intent(this, WpaCommandListActivity.class);