diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b5de5731..fbb43419f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,7 +103,7 @@ test:unit:postgresql:
     - ruby -I test/ test/integration/monitoring_controller_test.rb
     - rake db:drop
 
-test:integration:email_helper:
+test:integration:email_helper_deliver:
   stage: test
   tags:
     - core
@@ -112,27 +112,7 @@ test:integration:email_helper:
     - rake db:create
     - rake db:migrate
     - ruby -I test/ test/integration/email_helper_test.rb
-    - rake db:drop
-
-test:integration:email_deliver:
-  stage: test
-  tags:
-    - core
-  script:
-    - export RAILS_ENV=test
-    - rake db:create
-    - rake db:migrate
     - ruby -I test/ test/integration/email_deliver_test.rb
-    - rake db:drop
-
-test:integration:email_keep_on_server:
-  stage: test
-  tags:
-    - core
-  script:
-    - export RAILS_ENV=test
-    - rake db:create
-    - rake db:migrate
     - ruby -I test/ test/integration/email_keep_on_server_test.rb
     - rake db:drop
 
@@ -162,29 +142,7 @@ test:integration:facebook:
     - rake db:drop
   allow_failure: true
 
-test:integration:geo_ip:
-  stage: test
-  tags:
-    - core
-  script:
-    - export RAILS_ENV=test
-    - rake db:create
-    - rake db:migrate
-    - ruby -I test/ test/integration/geo_ip_test.rb
-    - rake db:drop
-
-test:integration:geo_location:
-  stage: test
-  tags:
-    - core
-  script:
-    - export RAILS_ENV=test
-    - rake db:create
-    - rake db:migrate
-    - ruby -I test/ test/integration/geo_location_test.rb
-    - rake db:drop
-
-test:integration:geo_calendar:
+test:integration:geo:
   stage: test
   tags:
     - core
@@ -193,6 +151,8 @@ test:integration:geo_calendar:
     - rake db:create
     - rake db:migrate
     - ruby -I test/ test/integration/geo_calendar_test.rb
+    - ruby -I test/ test/integration/geo_location_test.rb
+    - ruby -I test/ test/integration/geo_ip_test.rb
     - rake db:drop
 
 test:integration:user_agent:
@@ -204,19 +164,10 @@ test:integration:user_agent:
     - rake db:create
     - rake db:migrate
     - ruby -I test/ test/integration/user_agent_test.rb
-    - rake db:drop
-
-test:integration:user_agent_proxy:
-  stage: test
-  tags:
-    - core
-  script:
     - export ZAMMAD_PROXY_TEST=true
-    - export RAILS_ENV=test
-    - rake db:create
-    - rake db:migrate
     - ruby -I test/ test/integration/user_agent_test.rb
     - rake db:drop
+  allow_failure: true
 
 test:integration:user_device:
   stage: test