diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php b/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
index 8394d0d4eea64f9dd3bb642dc9db0eac4b9d9a9a..a8fa9a7a6c197d083ef7f7f61aea8d53db880014 100644
--- a/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
+++ b/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
@@ -128,20 +128,20 @@ cd ../../../../../\n\n";
 
     protected function getDownloadToPath($plugin)
     {
-        $downloadTo = PIWIK_DOCUMENT_ROOT . "/";
         if (empty($plugin)) {
-            $downloadTo .= "tests/UI/expected-ui-screenshots/";
-        } else {
-            $downloadTo .= "plugins/$plugin/tests/UI/expected-ui-screenshots/";
+            return PIWIK_DOCUMENT_ROOT . "/tests/UI/expected-ui-screenshots/";
         }
+
+        $downloadTo = PIWIK_DOCUMENT_ROOT . "/plugins/$plugin/tests/UI/expected-ui-screenshots/";
         if(is_dir($downloadTo)) {
             return $downloadTo;
         }
+
+        // Maybe the plugin is using folder "Test/" instead of "tests/"
         $downloadTo = str_replace("tests/", "Test/", $downloadTo);
         if(is_dir($downloadTo)) {
             return $downloadTo;
         }
-
         throw new \Exception("Download to path could not be found: $downloadTo");
     }