diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 0aa757ed..eadf66ff 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -235,10 +235,6 @@ export DEVSTACK_GATE_KEYSTONE_V3=${DEVSTACK_GATE_KEYSTONE_V3:-0}
 # Set to 1 to enable installing test requirements
 export DEVSTACK_GATE_INSTALL_TESTONLY=${DEVSTACK_GATE_INSTALL_TESTONLY:-0}
 
-# Set to the name of the project (e.g. 'neutron') whose testr
-# artifacts should be processed on cleanup.
-export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=${DEVSTACK_GATE_TESTR_ARTIFACT_TARGET:-tempest}
-
 # Set to 0 to run services that default under Apache + mod_wsgi under alternatives (e.g. eventlet)
 # if possible
 export DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES=${DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES:-1}
diff --git a/functions.sh b/functions.sh
index 7c18ce8d..2402f78d 100644
--- a/functions.sh
+++ b/functions.sh
@@ -544,8 +544,6 @@ function cleanup_host {
     local xtrace=$(set +o | grep xtrace)
     set -o xtrace
 
-    local testr_target=$DEVSTACK_GATE_TESTR_ARTIFACT_TARGET
-
     cd $WORKSPACE
 
     # Sleep to give services a chance to flush their log buffers.
@@ -698,11 +696,8 @@ function cleanup_host {
         sudo mv $WORKSPACE/rpm-qa.txt.gz $BASE/logs/
     fi
 
-    process_testr_artifacts $testr_target
-    if [[ "$testr_target" == "tempest" ]]; then
-        # Attempt to process artifacts from the old grenade path
-        process_testr_artifacts $testr_target old
-    fi
+    process_testr_artifacts tempest
+    process_testr_artifacts tempest old
 
     if [ -f $BASE/new/tempest/tempest.log ] ; then
         sudo cp $BASE/new/tempest/tempest.log $BASE/logs/tempest.log