diff --git a/Gemfile b/Gemfile
index 2a1f1429c..a2f38d2b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,6 +103,10 @@ group :development, :test do
   gem 'rubocop-checkstyle_formatter', require: false
   gem 'rubocop-rspec', require: false
 
+  gem "nyan-cat-formatter"
+
+  gem 'parallel_tests'
+
   # Deploy
   gem 'mina', git: 'https://github.com/mina-deploy/mina.git'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index abfada111..26d45e769 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,6 +211,8 @@ GEM
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    nyan-cat-formatter (0.11)
+      rspec (>= 2.99, >= 2.14.2, < 4)
     open4 (1.3.4)
     openid_connect (0.9.2)
       activemodel
@@ -224,6 +226,9 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     orm_adapter (0.5.0)
+    parallel (1.6.1)
+    parallel_tests (1.9.0)
+      parallel
     parser (2.2.2.2)
       ast (>= 1.1, < 3.0)
     pg (0.18.2)
@@ -452,7 +457,9 @@ DEPENDENCIES
   logstasher
   mailjet
   mina!
+  nyan-cat-formatter
   openid_connect
+  parallel_tests
   pg
   poltergeist
   pry-byebug
diff --git a/config/database.yml b/config/database.yml
index f37a296b5..2dd44b635 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,7 +12,7 @@ development:
 test:
   adapter: postgresql
   encoding: unicode
-  database: tps_test
+  database: tps_test<%= ENV['TEST_ENV_NUMBER'] %>
   host: localhost
   pool: 5
   username: tps