diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index ab39ce54..e9133ed3 100644
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -56,6 +56,7 @@ class swift::proxy(
 ) {
 
   include swift::params
+  include concat::setup
 
   validate_bool($account_autocreate)
   validate_bool($allow_account_management)
diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index 9f77a47b..1f32ba0b 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -34,6 +34,7 @@ define swift::storage::server(
   }
 
   include "swift::storage::${type}"
+  include concat::setup
 
   validate_re($name, '^\d+$')
   validate_re($type, '^object|container|account$')
diff --git a/spec/classes/swift_proxy_authtoken_spec.rb b/spec/classes/swift_proxy_authtoken_spec.rb
index eda71618..893ea553 100644
--- a/spec/classes/swift_proxy_authtoken_spec.rb
+++ b/spec/classes/swift_proxy_authtoken_spec.rb
@@ -9,7 +9,10 @@ describe 'swift::proxy::authtoken' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    '
+      include concat::setup
+      concat { "/etc/swift/proxy-server.conf": }
+    '
   end
 
   describe 'when using the default signing directory' do
diff --git a/spec/classes/swift_proxy_cache_spec.rb b/spec/classes/swift_proxy_cache_spec.rb
index d8168ed4..41644558 100644
--- a/spec/classes/swift_proxy_cache_spec.rb
+++ b/spec/classes/swift_proxy_cache_spec.rb
@@ -12,7 +12,8 @@ describe 'swift::proxy::cache' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }
      class { "memcached": max_memory => 1 }'
   end
 
diff --git a/spec/classes/swift_proxy_catch_errors_spec.rb b/spec/classes/swift_proxy_catch_errors_spec.rb
index 0d7dbf8e..2fcb8294 100644
--- a/spec/classes/swift_proxy_catch_errors_spec.rb
+++ b/spec/classes/swift_proxy_catch_errors_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::catch_errors' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_ceilometer_spec.rb b/spec/classes/swift_proxy_ceilometer_spec.rb
index 21019829..2727199f 100644
--- a/spec/classes/swift_proxy_ceilometer_spec.rb
+++ b/spec/classes/swift_proxy_ceilometer_spec.rb
@@ -10,7 +10,8 @@ describe 'swift::proxy::ceilometer' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }
      class { "ssh::server::install": }
      class { "swift":
         swift_hash_suffix => "dummy"
diff --git a/spec/classes/swift_proxy_formpost_spec.rb b/spec/classes/swift_proxy_formpost_spec.rb
index 6de02276..caadff8d 100644
--- a/spec/classes/swift_proxy_formpost_spec.rb
+++ b/spec/classes/swift_proxy_formpost_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::formpost' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_healthcheck_spec.rb b/spec/classes/swift_proxy_healthcheck_spec.rb
index 4216a0aa..77e66dc1 100644
--- a/spec/classes/swift_proxy_healthcheck_spec.rb
+++ b/spec/classes/swift_proxy_healthcheck_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::healthcheck' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_keystone_spec.rb b/spec/classes/swift_proxy_keystone_spec.rb
index 81b7f095..52e71a6d 100644
--- a/spec/classes/swift_proxy_keystone_spec.rb
+++ b/spec/classes/swift_proxy_keystone_spec.rb
@@ -13,7 +13,10 @@ describe 'swift::proxy::keystone' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    '
+      include concat::setup
+      concat { "/etc/swift/proxy-server.conf": }
+    '
   end
 
   it { should contain_file(fragment_file).with_content(/[filter:keystone]/) }
diff --git a/spec/classes/swift_proxy_ratelimit_spec.rb b/spec/classes/swift_proxy_ratelimit_spec.rb
index c7702964..054e79eb 100644
--- a/spec/classes/swift_proxy_ratelimit_spec.rb
+++ b/spec/classes/swift_proxy_ratelimit_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::ratelimit' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_s3token_spec.rb b/spec/classes/swift_proxy_s3token_spec.rb
index f84af8ed..9bfeaa59 100644
--- a/spec/classes/swift_proxy_s3token_spec.rb
+++ b/spec/classes/swift_proxy_s3token_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::s3token' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_staticweb_spec.rb b/spec/classes/swift_proxy_staticweb_spec.rb
index 0ed7672d..b7f2c353 100644
--- a/spec/classes/swift_proxy_staticweb_spec.rb
+++ b/spec/classes/swift_proxy_staticweb_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::staticweb' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_swauth_spec.rb b/spec/classes/swift_proxy_swauth_spec.rb
index 5c4d7c3a..08c94dd4 100644
--- a/spec/classes/swift_proxy_swauth_spec.rb
+++ b/spec/classes/swift_proxy_swauth_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::swauth' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_swift3_spec.rb b/spec/classes/swift_proxy_swift3_spec.rb
index 84d81050..f1dc674c 100644
--- a/spec/classes/swift_proxy_swift3_spec.rb
+++ b/spec/classes/swift_proxy_swift3_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::swift3' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_tempurl_spec.rb b/spec/classes/swift_proxy_tempurl_spec.rb
index 7ebf3a3e..87eac0de 100644
--- a/spec/classes/swift_proxy_tempurl_spec.rb
+++ b/spec/classes/swift_proxy_tempurl_spec.rb
@@ -9,7 +9,8 @@ describe 'swift::proxy::tempurl' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/proxy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/defines/swift_storage_filter_healthcheck_spec.rb b/spec/defines/swift_storage_filter_healthcheck_spec.rb
index f1ccb82c..0acd912c 100644
--- a/spec/defines/swift_storage_filter_healthcheck_spec.rb
+++ b/spec/defines/swift_storage_filter_healthcheck_spec.rb
@@ -12,7 +12,8 @@ describe 'swift::storage::filter::healthcheck' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/dummy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/dummy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/defines/swift_storage_filter_recon_spec.rb b/spec/defines/swift_storage_filter_recon_spec.rb
index 37e8acdc..a56f62f0 100644
--- a/spec/defines/swift_storage_filter_recon_spec.rb
+++ b/spec/defines/swift_storage_filter_recon_spec.rb
@@ -12,7 +12,8 @@ describe 'swift::storage::filter::recon' do
   end
 
   let :pre_condition do
-    'concat { "/etc/swift/dummy-server.conf": }'
+    'class { "concat::setup": }
+     concat { "/etc/swift/dummy-server.conf": }'
   end
 
   let :fragment_file do