gistfile1.diff

diff --git a/.fixtures.yml b/.fixtures.yml
index 34dd37c..862ed07 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -6,7 +6,6 @@ fixtures:
     'mysql':
       repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
       ref:  'origin/2.2.x'
-    'openstacklib': 'git://github.com/stackforge/puppet-openstacklib.git'
     'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
     'inifile': 'git://github.com/puppetlabs/puppetlabs-inifile'
     'postgresql':
@@ -14,3 +13,4 @@ fixtures:
       ref:  '2.5.0'
   symlinks:
     'keystone': "#{source_dir}"
+    'openstacklib': "#{source_dir}/../puppet-openstacklib"
diff --git a/spec/unit/provider/keystone_tenant/openstack_spec.rb b/spec/unit/pr
index 2ddfb19..8b41f5f 100644
--- a/spec/unit/provider/keystone_tenant/openstack_spec.rb
+++ b/spec/unit/provider/keystone_tenant/openstack_spec.rb
@@ -31,14 +31,15 @@ describe provider_class do
       provider_class.new(resource)
     end
 
+    list_default_string = '"ID","Name","Description","Enabled"
+"1cb05cfed7c24279be884ba4f6520262","foo","foo","true"
+'
+
     describe '#create' do
       it 'creates a tenant' do
         provider.class.stubs(:openstack)
-                      .with('project', 'list', '--long', '--format', 'json', [[
-                      .returns('
-[{"ID": "1cb05cfed7c24279be884ba4f6520262", "Name": "foo", "Description": "foo"
-'
-                      )
+                      .with('project', 'list', '--long', '--quiet', '--format',
+                      .returns(list_default_string)
         provider.class.stubs(:openstack)
                       .with('project', 'create', [['foo', '--enable', '--descri
         provider.create
@@ -49,8 +50,8 @@ describe provider_class do
     describe '#destroy' do
       it 'destroys a tenant' do
         provider.class.stubs(:openstack)
-                      .with('project', 'list', '--long', '--format', 'json', [[
-                      .returns('[]')
+                      .with('project', 'list', '--long', '--quiet', '--format',
+                      .returns('')
         provider.class.stubs(:openstack)
                       .with('project', 'delete', [['foo', '--os-username', 'tes
         provider.destroy
@@ -64,11 +65,8 @@ describe provider_class do
 
         subject(:response) do
           provider.class.stubs(:openstack)
-                        .with('project', 'list', '--long', '--format', 'json', 
-                        .returns('
-[{"ID":   "1cb05cfed7c24279be884ba4f6520262", "Name": "foo", "Description": "fo
-'
-                        )
+                        .with('project', 'list', '--long', '--quiet', '--format
+                        .returns(list_default_string)
           response = provider.exists?
         end
 
@@ -79,8 +77,8 @@ describe provider_class do
 
         subject(:response) do
           provider.class.stubs(:openstack)
-                        .with('project', 'list', '--long', '--format', 'json', 
-                        .returns('[]')
+                        .with('project', 'list', '--long', '--quiet', '--format
+                        .returns('')
           response = provider.exists?
         end
 
@@ -91,11 +89,8 @@ describe provider_class do
     describe '#instances' do
       it 'finds every tenant' do
         provider.class.stubs(:openstack)
-                      .with('project', 'list', '--long', '--format', 'json', [[
-                      .returns('
-[{"ID": "1cb05cfed7c24279be884ba4f6520262", "Name": "foo", "Description": "foo"
-'
-                      )
+                      .with('project', 'list', '--long', '--quiet', '--format',
+                      .returns(list_default_string)
         instances = provider.instances
         expect(instances.count).to eq(1)
       end