diff --git a/spec/acceptance/keystone_wsgi_apache_spec.rb b/spec/acceptance/10_basic_keystone_spec.rb
similarity index 100%
rename from spec/acceptance/keystone_wsgi_apache_spec.rb
rename to spec/acceptance/10_basic_keystone_spec.rb
diff --git a/spec/acceptance/keystone_federation_identity_provider_spec.rb b/spec/acceptance/20_keystone_federation_identity_provider_spec.rb
similarity index 100%
rename from spec/acceptance/keystone_federation_identity_provider_spec.rb
rename to spec/acceptance/20_keystone_federation_identity_provider_spec.rb
diff --git a/spec/acceptance/keystone_federation_shibboleth_spec.rb b/spec/acceptance/21_keystone_federation_shibboleth_spec.rb
similarity index 100%
rename from spec/acceptance/keystone_federation_shibboleth_spec.rb
rename to spec/acceptance/21_keystone_federation_shibboleth_spec.rb
diff --git a/spec/acceptance/default_domain_spec.rb b/spec/acceptance/30_keystone_default_domain_spec.rb
similarity index 100%
rename from spec/acceptance/default_domain_spec.rb
rename to spec/acceptance/30_keystone_default_domain_spec.rb
diff --git a/spec/acceptance/99_keystone_config_spec.rb b/spec/acceptance/99_keystone_config_spec.rb
new file mode 100644
index 000000000..476121ff3
--- /dev/null
+++ b/spec/acceptance/99_keystone_config_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper_acceptance'
+
+describe 'basic keystone_config resource' do
+
+  context 'default parameters' do
+
+    it 'should work with no errors' do
+      pp= <<-EOS
+      Exec { logoutput => 'on_failure' }
+
+      File <||> -> Keystone_config <||>
+
+      file { '/etc/keystone' :
+        ensure => directory,
+      }
+      file { '/etc/keystone/keystone.conf' :
+        ensure => file,
+      }
+
+      keystone_config { 'DEFAULT/thisshouldexist' :
+        value => 'foo',
+      }
+
+      keystone_config { 'DEFAULT/thisshouldnotexist' :
+        value => '<SERVICE DEFAULT>',
+      }
+
+      keystone_config { 'DEFAULT/thisshouldexist2' :
+        value             => '<SERVICE DEFAULT>',
+        ensure_absent_val => 'toto',
+      }
+
+      keystone_config { 'DEFAULT/thisshouldnotexist2' :
+        value             => 'toto',
+        ensure_absent_val => 'toto',
+      }
+
+      keystone_config { 'DEFAULT/thisshouldexist3' :
+        value => ['foo', 'bar'],
+      }
+      EOS
+
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+
+    describe file('/etc/keystone/keystone.conf') do
+      it { is_expected.to exist }
+      it { is_expected.to contain('thisshouldexist=foo') }
+      it { is_expected.to contain('thisshouldexist2=<SERVICE DEFAULT>') }
+      it { is_expected.to contain('thisshouldexist3=foo') }
+      it { is_expected.to contain('thisshouldexist3=bar') }
+
+      describe '#content' do
+        subject { super().content }
+        it { is_expected.to_not match /thisshouldnotexist/ }
+      end
+    end
+  end
+end