diff --git a/vars/functionalTestPostV2.groovy b/vars/functionalTestPostV2.groovy
index 375698560..68095f89c 100755
--- a/vars/functionalTestPostV2.groovy
+++ b/vars/functionalTestPostV2.groovy
@@ -1,7 +1,7 @@
 // vars/functionalTestPostV2.groovy
 
   /**
-   * functionalTestPost step method
+   * functionalTestPostV2 step method
    *
    * @param config Map of parameters passed
    *
@@ -13,11 +13,21 @@
    *
    * config['testResults']         Junit test result files.
    *                               Default env.STAGE_NAME subdirectories
+   *
+   * config['NODELIST']            The list of nodes the test was run on.
+   *                               Default env.NODELIST.
+   *
+   * config['remote_acct']         The account used to run the tests on the cluster.
+   *                               Default jenkins.
    */
 
 def call(Map config = [:]) {
 
+    String nodelist = config.get('NODELIST', env.NODELIST)
+    String remote_acct = config.get('remote_acct', 'jenkins')
     String always_script = config.get('always_script',
+                                      'NODELIST="' + nodelist + '" ' +
+                                      'REMOTE_ACCT="' + remote_acct + '" ' +
                                       'ci/functional/job_cleanup.sh')
     String rc = sh label: "Job Cleanup",
                    script: always_script,