diff --git a/spec/classes/swift_keymaster.rb b/spec/classes/swift_keymaster.rb
deleted file mode 100644
index bdb7de27..00000000
--- a/spec/classes/swift_keymaster.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe 'swift::keymaster' do
-  shared_examples 'swift::keymaster' do
-    describe "when using default parameters" do
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/api_class').with_value('castellan.key_manager.barbican_key_manager.BarbicanKeyManager') }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/username').with_value('swift') }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/project_name').with_value('services') }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/project_domain_id').with_value('default') }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/user_domain_id').with_value('default') }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/meta_version_to_write').with_value('<SERVICE DEFAULT>') }
-    end
-
-    describe "when overriding default parameters" do
-      let :params do
-        {
-          :key_id => 'dummy_key_id',
-          :password => 'fake_password',
-          :auth_endpoint => 'http://127.0.0.1:5000',
-          :project_name => 'barbican_swift_service',
-          :meta_version_to_write => 3,
-        }
-      end
-
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/key_id').with_value('dummy_key_id') }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/password').with_value('fake_password').with_secret(true) }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/auth_endpoint').with_value('http://127.0.0.1:5000') }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/project_name').with_value('barbican_swift_service') }
-      it { is_expected.to contain_swift_keymaster_config('kms_keymaster/meta_version_to_write').with_value('3') }
-    end
-  end
-
-  on_supported_os({
-    :supported_os => OSDefaults.get_supported_os
-  }).each do |os,facts|
-    context "on #{os}" do
-      let (:facts) do
-        facts.merge(OSDefaults.get_facts())
-      end
-
-      it_configures 'swift::keymaster'
-    end
-  end
-end
diff --git a/spec/classes/swift_keymaster_spec.rb b/spec/classes/swift_keymaster_spec.rb
new file mode 100644
index 00000000..e9163d76
--- /dev/null
+++ b/spec/classes/swift_keymaster_spec.rb
@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'swift::keymaster' do
+  shared_examples 'swift::keymaster' do
+    context "when using default parameters" do
+      it 'configures keymaster options' do
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/api_class').with_value('barbican')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/username').with_value('swift')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/project_name').with_value('services')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/project_domain_id').with_value('default')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/user_domain_id').with_value('default')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/meta_version_to_write').with_value('<SERVICE DEFAULT>')
+      end
+    end
+
+    describe "when overriding default parameters" do
+      let :params do
+        {
+          :api_class             => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
+          :key_id                => 'dummy_key_id',
+          :password              => 'fake_password',
+          :auth_endpoint         => 'http://127.0.0.1:5000',
+          :project_name          => 'barbican_swift_service',
+          :meta_version_to_write => 3,
+        }
+      end
+
+      it 'configures keymaster options' do
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/api_class').with_value('castellan.key_manager.barbican_key_manager.BarbicanKeyManager')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/key_id').with_value('dummy_key_id')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/password').with_value('fake_password').with_secret(true)
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/auth_endpoint').with_value('http://127.0.0.1:5000')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/project_name').with_value('barbican_swift_service')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/meta_version_to_write').with_value('3')
+      end
+    end
+  end
+
+  on_supported_os({
+    :supported_os => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts())
+      end
+
+      it_configures 'swift::keymaster'
+    end
+  end
+end