diff --git a/spec/account_spec.rb b/spec/account_spec.rb
index 4ccd9c4..3a9e0bd 100644
--- a/spec/account_spec.rb
+++ b/spec/account_spec.rb
@@ -2,21 +2,12 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::account-server' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['lsb']['code'] = 'precise'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
-      @node.set['openstack']['object-storage']['network']['account-bind-ip'] = '10.0.0.1'
-      @node.set['openstack']['object-storage']['network']['account-bind-port'] = '8080'
       @node.set['openstack']['object-storage']['disk_enum_expr'] = "[{ 'sda' => {}}]"
       @node.set['openstack']['object-storage']['disk_test_filter'] = [
         'candidate =~ /sd[^a]/ or candidate =~ /hd[^a]/ or candidate =~ /vd[^a]/ or candidate =~ /xvd[^a]/',
diff --git a/spec/common_spec.rb b/spec/common_spec.rb
index 32ecc15..f9d28cf 100644
--- a/spec/common_spec.rb
+++ b/spec/common_spec.rb
@@ -2,22 +2,12 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::common' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['platform_family'] = 'debian'
-      @node.set['lsb']['codename'] = 'precise'
-      @node.set['openstack']['object-storage']['release'] = 'havana'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
-      @node.set['openstack']['object-storage']['git_builder_ip'] = '10.0.0.10'
 
       # TODO: this does not work
       # ::Chef::Log.should_receive(:info).with('chefspec: precise-updates/havana')
diff --git a/spec/container_spec.rb b/spec/container_spec.rb
index ddb8d4e..29e6139 100644
--- a/spec/container_spec.rb
+++ b/spec/container_spec.rb
@@ -2,23 +2,14 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::container-server' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['lsb']['code'] = 'precise'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
       @node.set['openstack']['object-storage']['network']['container-bind-ip'] = '10.0.0.1'
-      @node.set['openstack']['object-storage']['network']['container-bind-port'] = '8080'
       @node.set['openstack']['object-storage']['container-server']['allowed_sync_hosts'] =  ['host1', 'host2', 'host3']
-      @node.set['openstack']['object-storage']['container-bind-port'] = '8080'
       @node.set['openstack']['object-storage']['disk_enum_expr'] = "[{ 'sda' => {}}]"
       @node.set['openstack']['object-storage']['disk_test_filter'] = [
         'candidate =~ /sd[^a]/ or candidate =~ /hd[^a]/ or candidate =~ /vd[^a]/ or candidate =~ /xvd[^a]/',
diff --git a/spec/disks_spec.rb b/spec/disks_spec.rb
index da5a2ec..3dae6b3 100644
--- a/spec/disks_spec.rb
+++ b/spec/disks_spec.rb
@@ -2,22 +2,12 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::disks' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['platform_family'] = 'debian'
-      @node.set['lsb']['codename'] = 'precise'
-      @node.set['openstack']['object-storage']['release'] = 'havana'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
-      @node.set['openstack']['object-storage']['git_builder_ip'] = '10.0.0.10'
       @node.set['openstack']['object-storage']['disk_enum_expr'] = "[{ 'sda' => {}}]"
       @node.set['openstack']['object-storage']['disk_test_filter'] = [
         'candidate =~ /sd[^a]/ or candidate =~ /hd[^a]/ or candidate =~ /vd[^a]/ or candidate =~ /xvd[^a]/',
diff --git a/spec/management_spec.rb b/spec/management_spec.rb
index 6ded900..25a2ba2 100644
--- a/spec/management_spec.rb
+++ b/spec/management_spec.rb
@@ -2,23 +2,12 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::management-server' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['lsb']['code'] = 'precise'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
-      @node.set['openstack']['object-storage']['statistics']['enabled'] = true
-      @node.set['openstack']['object-storage']['swauth_source'] = 'package'
-      @node.set['openstack']['object-storage']['platform']['swauth_packages'] = ['swauth']
-
       @chef_run.converge 'openstack-object-storage::management-server'
     end
 
diff --git a/spec/object_spec.rb b/spec/object_spec.rb
index e3f90ae..1d38a48 100644
--- a/spec/object_spec.rb
+++ b/spec/object_spec.rb
@@ -2,21 +2,12 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::object-server' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['lsb']['code'] = 'precise'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
-      @node.set['openstack']['object-storage']['network']['object-bind-ip'] = '10.0.0.1'
-      @node.set['openstack']['object-storage']['network']['object-bind-port'] = '8080'
       @node.set['openstack']['object-storage']['disk_enum_expr'] = "[{ 'sda' => {}}]"
       @node.set['openstack']['object-storage']['disk_test_filter'] = [
         'candidate =~ /sd[^a]/ or candidate =~ /hd[^a]/ or candidate =~ /vd[^a]/ or candidate =~ /xvd[^a]/',
diff --git a/spec/proxy_spec.rb b/spec/proxy_spec.rb
index 5c158e8..884b57c 100644
--- a/spec/proxy_spec.rb
+++ b/spec/proxy_spec.rb
@@ -2,11 +2,6 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::proxy-server' do
-
-  #--------------
-  # UBUNTU
-  #--------------
-
   describe 'ubuntu' do
 
     before do
@@ -14,12 +9,6 @@ describe 'openstack-object-storage::proxy-server' do
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
       @node.set['cpu']['total'] = 6
-      @node.set['lsb']['code'] = 'precise'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
-      @node.set['openstack']['object-storage']['platform']['swauth_packages'] = ['swauth']
-      @node.set['openstack']['object-storage']['swauth_source'] = 'package'
-      @node.set['openstack']['object-storage']['network']['proxy-bind-ip'] = '10.0.0.1'
-      @node.set['openstack']['object-storage']['network']['proxy-bind-port'] = '8080'
       @chef_run.converge 'openstack-object-storage::proxy-server'
     end
 
diff --git a/spec/ring-repo_spec.rb b/spec/ring-repo_spec.rb
index 2800a6c..7f56962 100644
--- a/spec/ring-repo_spec.rb
+++ b/spec/ring-repo_spec.rb
@@ -2,22 +2,12 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::ring-repo' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['platform_family'] = 'debian'
-      @node.set['lsb']['codename'] = 'precise'
-      @node.set['openstack']['object-storage']['release'] = 'havana'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
-      @node.set['openstack']['object-storage']['git_builder_ip'] = '10.0.0.10'
       @chef_run.converge 'openstack-object-storage::ring-repo'
     end
 
diff --git a/spec/rsync_spec.rb b/spec/rsync_spec.rb
index bd84142..b128a5a 100644
--- a/spec/rsync_spec.rb
+++ b/spec/rsync_spec.rb
@@ -2,22 +2,12 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::rsync' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['platform_family'] = 'debian'
-      @node.set['lsb']['codename'] = 'precise'
-      @node.set['openstack']['object-storage']['release'] = 'havana'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
-      @node.set['openstack']['object-storage']['git_builder_ip'] = '10.0.0.10'
       @chef_run.converge 'openstack-object-storage::rsync'
     end
 
diff --git a/spec/storage-common_spec.rb b/spec/storage-common_spec.rb
index b9b5da7..67a05b8 100644
--- a/spec/storage-common_spec.rb
+++ b/spec/storage-common_spec.rb
@@ -2,19 +2,12 @@
 require_relative 'spec_helper'
 
 describe 'openstack-object-storage::storage-common' do
-
-  #-------------------
-  # UBUNTU
-  #-------------------
-
   describe 'ubuntu' do
 
     before do
       swift_stubs
       @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
       @node = @chef_run.node
-      @node.set['lsb']['code'] = 'precise'
-      @node.set['openstack']['object-storage']['authmode'] = 'swauth'
       @chef_run.converge 'openstack-object-storage::storage-common'
     end