diff --git a/devops-service/app/devops-api2.rb b/devops-service/app/devops-api2.rb
index a4a92d2..0337734 100644
--- a/devops-service/app/devops-api2.rb
+++ b/devops-service/app/devops-api2.rb
@@ -39,10 +39,7 @@ module Devops
         Devops::Api2.settings.mongo.create_root_user
         ::Provider::ProviderFactory.init(config)
 
-        if config[:stub_classes]
-          Stubber.stub_providers!
-          Stubber.stub_models!
-        end
+        Stubber.stub_providers! if config[:stub_classes]
       end
 
       def routes
diff --git a/devops-service/lib/stubber.rb b/devops-service/lib/stubber.rb
index 82af032..18b530f 100644
--- a/devops-service/lib/stubber.rb
+++ b/devops-service/lib/stubber.rb
@@ -2,8 +2,4 @@ module Stubber
   def self.stub_providers!
     Dir["tests/stubs/providers/*.rb"].each {|file| require file }
   end
-
-  def self.stub_models!
-    Dir["tests/stubs/models/stack/*.rb"].each {|file| require file }
-  end
 end
diff --git a/devops-service/tests/stubs/models/stack/stack_openstack.rb b/devops-service/tests/stubs/models/stack/stack_openstack.rb
deleted file mode 100644
index 8097da7..0000000
--- a/devops-service/tests/stubs/models/stack/stack_openstack.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-puts '!!! WARNING: Some StackOpenstack methods are stubbed'
-
-module Devops
-  module Model
-    class StackOpenstack < StackBase
-      def create_stack_in_cloud!
-        self.cloud_stack_id = '4c712026-dcd5-4664-90b8-0915494c1332'
-      end
-
-
-      def delete_stack_in_cloud!
-        true
-      end
-
-    end
-  end
-end
\ No newline at end of file
diff --git a/devops-service/tests/stubs/providers/openstack.rb b/devops-service/tests/stubs/providers/openstack.rb
index 1414997..0247888 100644
--- a/devops-service/tests/stubs/providers/openstack.rb
+++ b/devops-service/tests/stubs/providers/openstack.rb
@@ -63,4 +63,12 @@ class Provider::Openstack
     ]
   end
 
+  def create_stack(stack)
+    '4c712026-dcd5-4664-90b8-0915494c1332'
+  end
+
+  def delete_stack(stack)
+    true
+  end
+
 end
\ No newline at end of file