diff --git a/compute/src/test/resources/initscript_with_java.sh b/compute/src/test/resources/initscript_with_java.sh
index 99d05645c6..623586197d 100644
--- a/compute/src/test/resources/initscript_with_java.sh
+++ b/compute/src/test/resources/initscript_with_java.sh
@@ -121,7 +121,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns
diff --git a/compute/src/test/resources/initscript_with_jetty.sh b/compute/src/test/resources/initscript_with_jetty.sh
index 741b6d2c11..469a446469 100644
--- a/compute/src/test/resources/initscript_with_jetty.sh
+++ b/compute/src/test/resources/initscript_with_jetty.sh
@@ -121,7 +121,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns
diff --git a/compute/src/test/resources/runscript.sh b/compute/src/test/resources/runscript.sh
index b7d261e6bf..214c8c6904 100644
--- a/compute/src/test/resources/runscript.sh
+++ b/compute/src/test/resources/runscript.sh
@@ -121,7 +121,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns
diff --git a/scriptbuilder/src/main/resources/functions/setupPublicCurl.sh b/scriptbuilder/src/main/resources/functions/setupPublicCurl.sh
index 8ee7c1fab5..3ca9fb7647 100644
--- a/scriptbuilder/src/main/resources/functions/setupPublicCurl.sh
+++ b/scriptbuilder/src/main/resources/functions/setupPublicCurl.sh
@@ -52,7 +52,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns
diff --git a/scriptbuilder/src/test/resources/test_install_chef_omnibus_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_chef_omnibus_scriptbuilder.sh
index e295c330a3..1996ac80fe 100644
--- a/scriptbuilder/src/test/resources/test_install_chef_omnibus_scriptbuilder.sh
+++ b/scriptbuilder/src/test/resources/test_install_chef_omnibus_scriptbuilder.sh
@@ -121,7 +121,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns
diff --git a/scriptbuilder/src/test/resources/test_install_chef_version_omnibus_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_chef_version_omnibus_scriptbuilder.sh
index 65807012ec..722609c5db 100644
--- a/scriptbuilder/src/test/resources/test_install_chef_version_omnibus_scriptbuilder.sh
+++ b/scriptbuilder/src/test/resources/test_install_chef_version_omnibus_scriptbuilder.sh
@@ -121,7 +121,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns
diff --git a/scriptbuilder/src/test/resources/test_install_git_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_git_scriptbuilder.sh
index eb1b71d23d..b7e4aa9b07 100644
--- a/scriptbuilder/src/test/resources/test_install_git_scriptbuilder.sh
+++ b/scriptbuilder/src/test/resources/test_install_git_scriptbuilder.sh
@@ -121,7 +121,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns
diff --git a/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
index 5157490c10..2387dfac9c 100644
--- a/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
+++ b/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
@@ -121,7 +121,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns
diff --git a/scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh
index 0ae5aaba52..135b121ffd 100644
--- a/scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh
+++ b/scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh
@@ -121,7 +121,7 @@ function ensure_hostname_in_hosts() {
     local ipaddr=`hostname -i`
   }
   # NOTE: we blindly trust existing hostname settings in /etc/hosts
-  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
+  egrep -q `hostname -s` /etc/hosts || echo "$ipaddr `hostname -f` `hostname -s`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns