diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
index 28348a0db2..8404cc2754 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
@@ -40,6 +40,9 @@ then
     echo "127.0.1.1 $HOSTNAME" | sudo tee -a /etc/hosts
 fi
 
+echo $HOSTNAME > /tmp/image-hostname.txt
+sudo mv /tmp/image-hostname.txt /etc/image-hostname.txt
+
 # Fedora image doesn't come with wget
 if [ -f /usr/bin/yum ]; then
     sudo yum -y install wget
diff --git a/modules/openstack_project/files/slave_scripts/run-tox.sh b/modules/openstack_project/files/slave_scripts/run-tox.sh
index f7ccbcdb25..a25aee4a56 100755
--- a/modules/openstack_project/files/slave_scripts/run-tox.sh
+++ b/modules/openstack_project/files/slave_scripts/run-tox.sh
@@ -21,6 +21,8 @@ then
   exit 1
 fi
 
+cat /etc/image-hostname.txt
+
 /usr/local/jenkins/slave_scripts/jenkins-oom-grep.sh pre
 
 sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre
diff --git a/modules/openstack_project/files/slave_scripts/run-unittests.sh b/modules/openstack_project/files/slave_scripts/run-unittests.sh
index f335612028..91ed4af802 100755
--- a/modules/openstack_project/files/slave_scripts/run-unittests.sh
+++ b/modules/openstack_project/files/slave_scripts/run-unittests.sh
@@ -20,6 +20,8 @@ export NOSE_HTML_OUT_FILE='nose_results.html'
 export TMPDIR=`/bin/mktemp -d`
 trap "rm -rf $TMPDIR" EXIT
 
+cat /etc/image-hostname.txt
+
 /usr/local/jenkins/slave_scripts/jenkins-oom-grep.sh pre
 
 sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre