diff --git a/manifests/init.pp b/manifests/init.pp
index 9d9593a4..26374b81 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -57,7 +57,6 @@ class swift(
   }
   file { '/var/lib/swift':
     ensure => directory,
-    owner  => 'swift'
   }
   file { '/var/run/swift':
     ensure => directory,
diff --git a/spec/classes/swift_spec.rb b/spec/classes/swift_spec.rb
index 1fab7b77..a2d676d2 100644
--- a/spec/classes/swift_spec.rb
+++ b/spec/classes/swift_spec.rb
@@ -31,6 +31,7 @@ describe 'swift' do
         :require => 'Package[swift]'
       }
     end
+    it {should contain_user('swift')}
     it {should contain_file('/home/swift').with(
       {:ensure => 'directory', :mode => '0700'
       }.merge(file_defaults)
@@ -42,6 +43,9 @@ describe 'swift' do
     it {should contain_file('/var/run/swift').with(
       {:ensure => 'directory'}.merge(file_defaults)
     )}
+    it {should contain_file('/var/lib/swift').with(
+      {:ensure => 'directory'}.merge(file_defaults)
+    )}
     it {should contain_file('/etc/swift/swift.conf').with(
       {:ensure  => 'present',
        :mode    => '0660',
@@ -52,8 +56,6 @@ describe 'swift' do
         'swift-hash/swift_hash_path_suffix').with_value('string')
     end
     it {should contain_package('swift').with_ensure('present')}
-    it {should contain_user('swift')}
-    it {should contain_file('/var/lib/swift').with_ensure('directory')}
   end
 
   describe 'when overriding package_ensure parameter' do