Index: test/functional/framework/FunctionalTestCase.java
===================================================================
--- test/functional/framework/FunctionalTestCase.java	(revision 284)
+++ test/functional/framework/FunctionalTestCase.java	(revision 285)
@@ -25,7 +25,9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 
-public class FunctionalTestCase extends JFCTestCase {
+abstract public class FunctionalTestCase extends JFCTestCase {
 
 	private KeyStroke getKey(String s) {
@@ -65,5 +67,16 @@
 		super.setUp();
 		setHelper(new RobotTestHelper());
+		
+		Main.ds = new DataSet();
+		Main.pref = new Preferences();
+		if (Main.map != null)
+			Main.main.setMapFrame(null);
+		
 		MainApplication.main(new String[]{});
+	}
+	
+	@Override protected void tearDown() throws Exception {
+		Main.parent.setVisible(false);
+		super.tearDown();
 	}