diff --git a/.travis.yml b/.travis.yml
index 74d93db2f..8d77cc9bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,20 +62,12 @@ script:
   - rake db:create
   - rake db:migrate
   - rake db:seed
+  - bundle exec rspec
+  - rake db:reset
   - rake test:units
   - rake test:controllers
   - ruby -I test/ test/integration/object_manager_test.rb
   - ruby -I test/ test/integration/package_test.rb
-  - rake assets:precompile
-  - rake db:drop
-  - rake db:create
-  - rake db:migrate
-  - rake db:seed
-  - ruby -I test/ test/integration/geo_location_test.rb
-  - ruby -I test/ test/integration/geo_calendar_test.rb
-  - ruby -I test/ test/integration/user_agent_test.rb
-  - ruby -I test/ test/integration/user_device_controller_test.rb
-  - rake db:drop
 after_success:
   - if [ "${DB}" = "mysql" ]; then contrib/travis-ci.org/trigger_docker_image_build.sh; fi
   - if [ "${DB}" = "mysql" ]; then contrib/travis-ci.org/trigger_docker_image_compose_build.sh; fi
diff --git a/test/integration/sipgate_controller_test.rb b/test/controllers/sipgate_controller_test.rb
similarity index 100%
rename from test/integration/sipgate_controller_test.rb
rename to test/controllers/sipgate_controller_test.rb