diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 025e12a5e9b..36dbcf55fc2 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -96,6 +96,7 @@ public class MageFrame extends javax.swing.JFrame {
 	private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
 	private JLabel title;
 	private Rectangle titleRectangle;
+	public final static String testModeArg = "-testMode=";
 	
 	/**
 	 * @return the session
@@ -553,6 +554,12 @@ public class MageFrame extends javax.swing.JFrame {
 	    	splash.update();
     	}
     	
+    	for (String arg: args) {
+			if (arg.startsWith(testModeArg)) {
+				System.setProperty(testModeArg, "true");
+			}
+		}
+    	
 		Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
 			public void uncaughtException(Thread t, Throwable e) {
 				logger.log(Level.SEVERE, null, e);
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
index a1910180e7f..ab6528e2339 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -152,7 +152,7 @@ public class TablesPanel extends javax.swing.JPanel implements Observer {
 
 		this.roomId = roomId;
 		session = MageFrame.getSession();
-		this.btnQuickStart.setVisible(true);
+		btnQuickStart.setVisible(System.getProperty(MageFrame.testModeArg) != null);
 		if (newTableDialog == null) {
 			newTableDialog = new NewTableDialog();
 			MageFrame.getDesktop().add(newTableDialog);