diff --git a/spec/vmpooler/api/v1/status_spec.rb b/spec/integration/api/v1/status_spec.rb
similarity index 100%
rename from spec/vmpooler/api/v1/status_spec.rb
rename to spec/integration/api/v1/status_spec.rb
diff --git a/spec/vmpooler/api/v1/token_spec.rb b/spec/integration/api/v1/token_spec.rb
similarity index 100%
rename from spec/vmpooler/api/v1/token_spec.rb
rename to spec/integration/api/v1/token_spec.rb
diff --git a/spec/vmpooler/api/v1/vm_hostname_spec.rb b/spec/integration/api/v1/vm_hostname_spec.rb
similarity index 100%
rename from spec/vmpooler/api/v1/vm_hostname_spec.rb
rename to spec/integration/api/v1/vm_hostname_spec.rb
diff --git a/spec/vmpooler/api/v1/vm_spec.rb b/spec/integration/api/v1/vm_spec.rb
similarity index 100%
rename from spec/vmpooler/api/v1/vm_spec.rb
rename to spec/integration/api/v1/vm_spec.rb
diff --git a/spec/vmpooler/api/v1/vm_template_spec.rb b/spec/integration/api/v1/vm_template_spec.rb
similarity index 100%
rename from spec/vmpooler/api/v1/vm_template_spec.rb
rename to spec/integration/api/v1/vm_template_spec.rb
diff --git a/spec/vmpooler/dashboard_spec.rb b/spec/integration/dashboard_spec.rb
similarity index 100%
rename from spec/vmpooler/dashboard_spec.rb
rename to spec/integration/dashboard_spec.rb
diff --git a/spec/vmpooler/api/helpers_spec.rb b/spec/unit/api/helpers_spec.rb
similarity index 100%
rename from spec/vmpooler/api/helpers_spec.rb
rename to spec/unit/api/helpers_spec.rb
diff --git a/spec/vmpooler/pool_manager_migration_spec.rb b/spec/unit/pool_manager_migration_spec.rb
similarity index 100%
rename from spec/vmpooler/pool_manager_migration_spec.rb
rename to spec/unit/pool_manager_migration_spec.rb
diff --git a/spec/vmpooler/pool_manager_spec.rb b/spec/unit/pool_manager_spec.rb
similarity index 99%
rename from spec/vmpooler/pool_manager_spec.rb
rename to spec/unit/pool_manager_spec.rb
index 6bf00bd..5f16bf3 100644
--- a/spec/vmpooler/pool_manager_spec.rb
+++ b/spec/unit/pool_manager_spec.rb
@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'time'
+require 'mock_redis'
 
 describe 'Pool Manager' do
   let(:logger) { double('logger') }