diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index 994c1b87..38f4b95b 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -160,8 +160,6 @@ define swift::storage::server(
 
   include "::swift::storage::${type}"
 
-  include ::concat::setup
-
   validate_re($name, '^\d+$')
   validate_re($type, '^object|container|account$')
   validate_array($pipeline)
diff --git a/spec/classes/swift_proxy_account_quotas_spec.rb b/spec/classes/swift_proxy_account_quotas_spec.rb
index 33897817..955996e2 100644
--- a/spec/classes/swift_proxy_account_quotas_spec.rb
+++ b/spec/classes/swift_proxy_account_quotas_spec.rb
@@ -27,8 +27,7 @@ describe 'swift::proxy::account_quotas' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-    concat { "/etc/swift/proxy-server.conf": }'
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_authtoken_spec.rb b/spec/classes/swift_proxy_authtoken_spec.rb
index a5feb3c7..44ca437c 100644
--- a/spec/classes/swift_proxy_authtoken_spec.rb
+++ b/spec/classes/swift_proxy_authtoken_spec.rb
@@ -7,10 +7,7 @@ describe 'swift::proxy::authtoken' do
   end
 
   let :pre_condition do
-    '
-      include concat::setup
-      concat { "/etc/swift/proxy-server.conf": }
-    '
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   describe 'when using the default signing directory' do
diff --git a/spec/classes/swift_proxy_bulk_spec.rb b/spec/classes/swift_proxy_bulk_spec.rb
index 0b72ec72..a34c8383 100644
--- a/spec/classes/swift_proxy_bulk_spec.rb
+++ b/spec/classes/swift_proxy_bulk_spec.rb
@@ -27,8 +27,7 @@ describe 'swift::proxy::bulk' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-    concat { "/etc/swift/proxy-server.conf": }'
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_cache_spec.rb b/spec/classes/swift_proxy_cache_spec.rb
index 531af822..4d77a924 100644
--- a/spec/classes/swift_proxy_cache_spec.rb
+++ b/spec/classes/swift_proxy_cache_spec.rb
@@ -11,8 +11,7 @@ describe 'swift::proxy::cache' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }
+    '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 b36645ec..80b8c033 100644
--- a/spec/classes/swift_proxy_catch_errors_spec.rb
+++ b/spec/classes/swift_proxy_catch_errors_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::catch_errors' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    '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 a9015de6..acfd89ea 100644
--- a/spec/classes/swift_proxy_ceilometer_spec.rb
+++ b/spec/classes/swift_proxy_ceilometer_spec.rb
@@ -9,8 +9,7 @@ describe 'swift::proxy::ceilometer' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }
+    'concat { "/etc/swift/proxy-server.conf": }
      class { "swift":
         swift_hash_suffix => "dummy"
      }'
diff --git a/spec/classes/swift_proxy_container_quotas_spec.rb b/spec/classes/swift_proxy_container_quotas_spec.rb
index de8426ff..3233da4c 100644
--- a/spec/classes/swift_proxy_container_quotas_spec.rb
+++ b/spec/classes/swift_proxy_container_quotas_spec.rb
@@ -27,8 +27,7 @@ describe 'swift::proxy::container_quotas' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-    concat { "/etc/swift/proxy-server.conf": }'
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_crossdomain_spec.rb b/spec/classes/swift_proxy_crossdomain_spec.rb
index bc7f3840..14ee3b70 100644
--- a/spec/classes/swift_proxy_crossdomain_spec.rb
+++ b/spec/classes/swift_proxy_crossdomain_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::crossdomain' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-    concat { "/etc/swift/proxy-server.conf": }'
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_formpost_spec.rb b/spec/classes/swift_proxy_formpost_spec.rb
index 2d50a0c1..d2386f37 100644
--- a/spec/classes/swift_proxy_formpost_spec.rb
+++ b/spec/classes/swift_proxy_formpost_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::formpost' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_gatekeeper_spec.rb b/spec/classes/swift_proxy_gatekeeper_spec.rb
index 200457ac..70015a72 100644
--- a/spec/classes/swift_proxy_gatekeeper_spec.rb
+++ b/spec/classes/swift_proxy_gatekeeper_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::gatekeeper' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-    concat { "/etc/swift/proxy-server.conf": }'
+    '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 4db55f63..0e1776a7 100644
--- a/spec/classes/swift_proxy_healthcheck_spec.rb
+++ b/spec/classes/swift_proxy_healthcheck_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::healthcheck' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    '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 ee159489..5f6762ca 100644
--- a/spec/classes/swift_proxy_keystone_spec.rb
+++ b/spec/classes/swift_proxy_keystone_spec.rb
@@ -11,10 +11,7 @@ describe 'swift::proxy::keystone' do
   end
 
   let :pre_condition do
-    '
-      include concat::setup
-      concat { "/etc/swift/proxy-server.conf": }
-    '
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   it { is_expected.to 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 ed462d43..5b848ef8 100644
--- a/spec/classes/swift_proxy_ratelimit_spec.rb
+++ b/spec/classes/swift_proxy_ratelimit_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::ratelimit' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    '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 8f6793f7..66a4671d 100644
--- a/spec/classes/swift_proxy_s3token_spec.rb
+++ b/spec/classes/swift_proxy_s3token_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::s3token' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_slo_spec.rb b/spec/classes/swift_proxy_slo_spec.rb
index 7f063d8e..97d2be72 100644
--- a/spec/classes/swift_proxy_slo_spec.rb
+++ b/spec/classes/swift_proxy_slo_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::slo' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-    concat { "/etc/swift/proxy-server.conf": }'
+    '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 7cff74ff..66001788 100644
--- a/spec/classes/swift_proxy_staticweb_spec.rb
+++ b/spec/classes/swift_proxy_staticweb_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::staticweb' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    '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 514d1a10..4bfd7ff1 100644
--- a/spec/classes/swift_proxy_swauth_spec.rb
+++ b/spec/classes/swift_proxy_swauth_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::swauth' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    '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 376ead72..0bd2f9ec 100644
--- a/spec/classes/swift_proxy_swift3_spec.rb
+++ b/spec/classes/swift_proxy_swift3_spec.rb
@@ -8,8 +8,7 @@ describe 'swift::proxy::swift3' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do
diff --git a/spec/classes/swift_proxy_tempauth_spec.rb b/spec/classes/swift_proxy_tempauth_spec.rb
index 087bbc8c..b7eec3ba 100644
--- a/spec/classes/swift_proxy_tempauth_spec.rb
+++ b/spec/classes/swift_proxy_tempauth_spec.rb
@@ -16,8 +16,7 @@ describe 'swift::proxy::tempauth' do
   let :params do default_params end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    '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 ac68dfb0..1f05cf58 100644
--- a/spec/classes/swift_proxy_tempurl_spec.rb
+++ b/spec/classes/swift_proxy_tempurl_spec.rb
@@ -7,8 +7,7 @@ describe 'swift::proxy::tempurl' do
   end
 
   let :pre_condition do
-    'class { "concat::setup": }
-     concat { "/etc/swift/proxy-server.conf": }'
+    'concat { "/etc/swift/proxy-server.conf": }'
   end
 
   let :fragment_file do