diff --git a/functions.sh b/functions.sh
index 8653a906..0528baec 100644
--- a/functions.sh
+++ b/functions.sh
@@ -404,7 +404,7 @@ function cleanup_host {
       sudo cp $BASE/old/screen-logs/* $BASE/logs/old/
       sudo cp $BASE/old/devstacklog.txt $BASE/logs/old/
       sudo cp $BASE/old/devstack/localrc $BASE/logs/old/localrc.txt
-      sudo cp $BASE/old/tempest/etc/tempest.conf $BASE/logs/old/tempest.conf.txt
+      sudo cp $BASE/old/tempest/etc/tempest.conf $BASE/logs/old/tempest_conf.txt
       sudo cp $BASE/new/grenade/localrc $BASE/logs/grenade/localrc.txt
       NEWLOGTARGET=$BASE/logs/new
     else
@@ -415,7 +415,7 @@ function cleanup_host {
     sudo cp $BASE/new/devstack/localrc $NEWLOGTARGET/localrc.txt
 
     # Copy tempest config file
-    sudo cp $BASE/new/tempest/etc/tempest.conf $NEWLOGTARGET/tempest.conf.txt
+    sudo cp $BASE/new/tempest/etc/tempest.conf $NEWLOGTARGET/tempest_conf.txt
 
     sudo iptables-save > $WORKSPACE/iptables.txt
     df -h > $WORKSPACE/df.txt