diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java
index 74bd0c5..959f386 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java
@@ -269,13 +269,13 @@
 	private IWorkbenchPart getActivePart() {
 		IWorkbenchWindow window = PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow();
-		if (window == null) {
-			return null;
-		}
+		assertNotNull(window);
 		IWorkbenchPage page = window.getActivePage();
 		if (page == null) {
-			return null;
+			window.setActivePage(window.getPages()[0]);
+			page = window.getActivePage();
 		}
+		assertNotNull(page);
 		return page.getActivePart();
 	}