diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e03893101..06871c6bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,8 @@ before_script:
 stages:
   - pre
   - test
-  - browser
+  - browser-core
+  - browser-integration
 
 pre:rubocop:
   stage: pre
@@ -442,7 +443,7 @@ browser:build:
     - public/assets/print-*
 
 test:browser:integration:api_client_ruby:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -459,7 +460,7 @@ test:browser:integration:api_client_ruby:
     - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:integration:api_client_php:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -479,7 +480,7 @@ test:browser:integration:api_client_php:
     - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:twitter_ff:
-  stage: browser
+  stage: browser-integration
   dependencies:
     - browser:build
   tags:
@@ -496,7 +497,7 @@ test:browser:twitter_ff:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:facebook_ff:
-  stage: browser
+  stage: browser-integration
   dependencies:
     - browser:build
   tags:
@@ -513,7 +514,7 @@ test:browser:facebook_ff:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:autowizard_ff:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -529,7 +530,7 @@ test:browser:autowizard_ff:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_1_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -550,7 +551,7 @@ test:browser:core:ff_1_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_2_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -571,7 +572,7 @@ test:browser:core:ff_2_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_3_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -588,7 +589,7 @@ test:browser:core:ff_3_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_4_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -609,7 +610,7 @@ test:browser:core:ff_4_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_5_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -630,7 +631,7 @@ test:browser:core:ff_5_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_6_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -651,7 +652,7 @@ test:browser:core:ff_6_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_1_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -672,7 +673,7 @@ test:browser:core:ff_1_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_2_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -693,7 +694,7 @@ test:browser:core:ff_2_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_3_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -710,7 +711,7 @@ test:browser:core:ff_3_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_4_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -731,7 +732,7 @@ test:browser:core:ff_4_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_5_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -752,7 +753,7 @@ test:browser:core:ff_5_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:ff_6_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -773,7 +774,7 @@ test:browser:core:ff_6_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_1_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -794,7 +795,7 @@ test:browser:core:chrome_1_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_2_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -815,7 +816,7 @@ test:browser:core:chrome_2_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_3_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -836,7 +837,7 @@ test:browser:core:chrome_3_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_4_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -857,7 +858,7 @@ test:browser:core:chrome_4_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_5_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -878,7 +879,7 @@ test:browser:core:chrome_5_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_6_mysql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -899,7 +900,7 @@ test:browser:core:chrome_6_mysql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_1_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -920,7 +921,7 @@ test:browser:core:chrome_1_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_2_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -941,7 +942,7 @@ test:browser:core:chrome_2_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_3_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -962,7 +963,7 @@ test:browser:core:chrome_3_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_4_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -983,7 +984,7 @@ test:browser:core:chrome_4_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_5_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -1004,7 +1005,7 @@ test:browser:core:chrome_5_postgresql:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:core:chrome_6_postgresql:
-  stage: browser
+  stage: browser-core
   dependencies:
     - browser:build
   tags:
@@ -1024,8 +1025,23 @@ test:browser:core:chrome_6_postgresql:
     - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
+test:browser:autowizard_chrome:
+  stage: browser-core
+  dependencies:
+    - browser:build
+  tags:
+    - browser
+  script:
+    - export BROWSER=chrome
+    - export BROWSER_URL=http://$IP:$BROWSER_PORT
+    - RAILS_ENV=test rake db:create
+    - cp contrib/auto_wizard_example.json auto_wizard.json
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
+    - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+
 test:browser:integration:twitter_chrome:
-  stage: browser
+  stage: browser-integration
   dependencies:
     - browser:build
   tags:
@@ -1041,7 +1057,7 @@ test:browser:integration:twitter_chrome:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:integration:facebook_chrome:
-  stage: browser
+  stage: browser-integration
   dependencies:
     - browser:build
   tags:
@@ -1057,7 +1073,7 @@ test:browser:integration:facebook_chrome:
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
 test:browser:integration:otrs_chrome:
-  stage: browser
+  stage: browser-integration
   dependencies:
     - browser:build
   tags:
@@ -1070,23 +1086,8 @@ test:browser:integration:otrs_chrome:
     - ruby -I test/ test/integration/otrs_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
     - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
 
-test:browser:integration:autowizard_chrome:
-  stage: browser
-  dependencies:
-    - browser:build
-  tags:
-    - browser
-  script:
-    - export BROWSER=chrome
-    - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - RAILS_ENV=test rake db:create
-    - cp contrib/auto_wizard_example.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
-
 test:browser:integration:zendesk_chrome:
-  stage: browser
+  stage: browser-integration
   dependencies:
     - browser:build
   tags:
diff --git a/test/integration/otrs_import_browser_test.rb b/test/integration/otrs_import_browser_test.rb
index 9adea8be2..505bea0fd 100644
--- a/test/integration/otrs_import_browser_test.rb
+++ b/test/integration/otrs_import_browser_test.rb
@@ -54,7 +54,7 @@ class OtrsImportBrowserTest < TestCase
     watch_for(
       css: 'body',
       value: 'login',
-      timeout: 480,
+      timeout: 600,
     )
 
   end
diff --git a/test/integration/zendesk_import_browser_test.rb b/test/integration/zendesk_import_browser_test.rb
index 156e8f362..60876e0bf 100644
--- a/test/integration/zendesk_import_browser_test.rb
+++ b/test/integration/zendesk_import_browser_test.rb
@@ -81,25 +81,25 @@ class ZendeskImportBrowserTest < TestCase
     watch_for(
       css:     '.js-group .js-done',
       value:   '2',
-      timeout: 60,
+      timeout: 120,
     )
 
     watch_for(
       css:     '.js-organization .js-done',
       value:   '1',
-      timeout: 60,
+      timeout: 120,
     )
 
     watch_for(
       css:   '.js-user .js-done',
       value: '141',
-      timeout: 60,
+      timeout: 120,
     )
 
     watch_for(
       css:     '.js-ticket .js-done',
       value:   '143',
-      timeout: 600,
+      timeout: 800,
     )
 
     watch_for(