diff --git a/manifests/init.pp b/manifests/init.pp
index 801b00eb..8b3d95fd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -49,7 +49,13 @@ class swift(
     ensure => directory,
     mode   => 2770,
   }
-
+  user {'swift':
+    ensure => present,
+  }
+  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 dcb008b2..503468f1 100644
--- a/spec/classes/swift_spec.rb
+++ b/spec/classes/swift_spec.rb
@@ -64,6 +64,8 @@ describe 'swift' do
       }.merge(file_defaults)
     )}
     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