diff --git a/tests/TestBaseClassWeb.php b/tests/TestBaseClassWeb.php
index d055b6437b2..50b3ae63aa8 100644
--- a/tests/TestBaseClassWeb.php
+++ b/tests/TestBaseClassWeb.php
@@ -285,30 +285,13 @@ protected function openAndFindViewTag($name, $view){
 
     /**
      * @param string $name
-     * @param array $view
+     * @return WebDriverElement
      * @throws \Exception
      */
-    protected function findViewTag($name, $view=[])
+    protected function findViewTag($name)
     {
-        $element = null;
-        try {
-            $element = self::find(WebDriverBy::id('action::' . $name));
-        } catch (\Exception $e) {
-            //throw new Exception($e->getMessage());
-            $shotName = self::takeScreenShot($name);
-        }
-        //$body = $this->webDriver->findElement(WebDriverBy::tagName('body'));
-        //var_dump($body->getText());
-        $this->assertNotEmpty(
-            $element,
-            'Possible screenshot at ' . $shotName . PHP_EOL .
-            sprintf(
-                'FAILED viewing %s on route %s, full url %s',
-                $name,
-                (isset($view['route'])?$view['route']:''),
-                $this->url
-            )
-        );
+        $element = self::find(WebDriverBy::id('action::' . $name));
+        return $element;
     }
 
     public static function takeScreenShot($name){
diff --git a/tests/controllers/AdminViewsTest.php b/tests/controllers/AdminViewsTest.php
index 1037aebad6d..c1dd75db7d3 100644
--- a/tests/controllers/AdminViewsTest.php
+++ b/tests/controllers/AdminViewsTest.php
@@ -180,7 +180,16 @@ public function testAdminClickViews($name,$view){
             );
             $clickable = self::$webDriver->findElement(WebDriverBy::id($view['clickId']));
             $clickable->click();
-            return $this->findViewTag($name,$view);
+            $element = $this->findViewTag($name);
+            $this->assertNotEmpty(
+                $element,
+                sprintf(
+                    'FAILED viewing %s on route %s, full url %s',
+                    $name,
+                    (isset($view['route']) ? $view['route'] : ''),
+                    $this->url
+                )
+            );
 
         }catch (\Exception $e){
             $screenshot = self::$webDriver->takeScreenshot();
diff --git a/tests/controllers/CreateSurveyTest.php b/tests/controllers/CreateSurveyTest.php
index 54c3f37db0f..8a08c471075 100644
--- a/tests/controllers/CreateSurveyTest.php
+++ b/tests/controllers/CreateSurveyTest.php
@@ -93,7 +93,8 @@ public function testCreateSurvey()
             self::findAndClick(WebDriverBy::id('save-form-button'));
 
             // find & assert the survey summary page tag
-            self::findViewTag('surveySummary');
+            $element = $this->findViewTag('surveySummary');
+            $this->assertNotEmpty($element);
 
             $idTag = self::find(WebDriverBy::id('survey_id'),5);
             $sid = intval($idTag->getAttribute('survey_id'));