diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/GEMPreferencesTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/GEMPreferencesTest.java
index 6b21f7d..1f96e13 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/GEMPreferencesTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/GEMPreferencesTest.java
@@ -69,6 +69,8 @@
 		GEMPreferences page = (GEMPreferences) dialog.getSelectedPage();
 		assertNotNull(page);
 		// there is no much open mehtods for testing....
+		
+		dialog.close();
 	}
 
 	protected static Shell getShell() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java
index 92ac81e..219a583 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java
@@ -22,6 +22,7 @@
 import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor;
 import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.AddConnectionCommand;
 import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.AddNodeCommand;
+import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DelegatingCommandStack;
 import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteConnectionCommand;
 import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteNodeCommand;
 import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.ReconnectConnectionCommand;
@@ -87,8 +88,9 @@
 		AddNodeCommand command = new AddNodeCommand();
 		command.setParent(getPageflow());
 		command.setChild(source);
-		editor.getDelegatingCommandStack().execute(
-				command);
+		DelegatingCommandStack stack = editor.getDelegatingCommandStack();
+		assertNotNull("PageflowPage will not be added to the Pageflow, as the underlying command stack is null", stack.getCurrentCommandStack());
+		stack.execute(command);
 		return source;
 	}