diff --git a/test/integration/application/serverspec/server_spec.rb b/test/integration/application/serverspec/server_spec.rb
index 622c920..a6c27e9 100644
--- a/test/integration/application/serverspec/server_spec.rb
+++ b/test/integration/application/serverspec/server_spec.rb
@@ -3,7 +3,7 @@
 require 'socket'
 
 describe "Application LWRP" do
-  let(:host_name) { Socket.gethostname }
+  let(:host_name) { Socket.gethostname.split('.').first }
   let(:app_tags) { MachineTag::Set.new(JSON.parse(IO.read("/vagrant/cache_dir/machine_tag_cache/#{host_name}/tags.json"))) }
 
   it "should have 5 application specific entries" do
diff --git a/test/integration/database/serverspec/server_spec.rb b/test/integration/database/serverspec/server_spec.rb
index 1e02ee0..79ca420 100644
--- a/test/integration/database/serverspec/server_spec.rb
+++ b/test/integration/database/serverspec/server_spec.rb
@@ -4,7 +4,7 @@
 require 'time'
 
 describe "Database server tags" do
-  let(:host_name) { Socket.gethostname }
+  let(:host_name) { Socket.gethostname.split('.').first }
   let(:db_tags) { MachineTag::Set.new(JSON.parse(IO.read("/vagrant/cache_dir/machine_tag_cache/#{host_name}/tags.json"))) }
 
   it "should have 5 application specific entries" do
diff --git a/test/integration/default/serverspec/server_spec.rb b/test/integration/default/serverspec/server_spec.rb
index 1fb115d..cc2f39d 100644
--- a/test/integration/default/serverspec/server_spec.rb
+++ b/test/integration/default/serverspec/server_spec.rb
@@ -3,7 +3,7 @@
 require 'socket'
 
 describe "Default server tags" do
-  let(:host_name) { Socket.gethostname }
+  let(:host_name) { Socket.gethostname.split('.').first }
   let(:default_tags) { MachineTag::Set.new(JSON.parse(IO.read("/vagrant/cache_dir/machine_tag_cache/#{host_name}/tags.json"))) }
 
   it "should have a UUID of 01-ABCDEFG123456" do
diff --git a/test/integration/load_balancer/serverspec/server_spec.rb b/test/integration/load_balancer/serverspec/server_spec.rb
index d27e1ee..0383669 100644
--- a/test/integration/load_balancer/serverspec/server_spec.rb
+++ b/test/integration/load_balancer/serverspec/server_spec.rb
@@ -3,7 +3,7 @@
 require 'socket'
 
 describe "Load balancer server tags" do
-  let(:host_name) { Socket.gethostname }
+  let(:host_name) { Socket.gethostname.split('.').first }
   let(:lb_tags) { MachineTag::Set.new(JSON.parse(IO.read("/vagrant/cache_dir/machine_tag_cache/#{host_name}/tags.json"))) }
 
   it "should have 2 application specific entry" do