1 files changed, 3 insertions, 8 deletions
diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
index 4e2ec1d935..f51c74d4a8 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
@@ -1,9 +1,8 @@
 package com.vaadin.tests.components;
 
 import com.vaadin.Application;
-import com.vaadin.server.AbstractWebApplicationContext;
+import com.vaadin.server.ApplicationContext;
 import com.vaadin.server.WebBrowser;
-import com.vaadin.service.ApplicationContext;
 
 public abstract class AbstractTestCase extends Application.LegacyApplication {
 
@@ -13,12 +12,8 @@ public abstract class AbstractTestCase extends Application.LegacyApplication {
 
     protected WebBrowser getBrowser() {
         ApplicationContext context = getContext();
-        if (context instanceof AbstractWebApplicationContext) {
-            WebBrowser webBrowser = ((AbstractWebApplicationContext) context)
-                    .getBrowser();
-            return webBrowser;
-        }
+        WebBrowser webBrowser = context.getBrowser();
+        return webBrowser;
 
-        return null;
     }
 }