diff --git a/.github/workflows/pytest-dbutils-backup_db.yml b/.github/workflows/pytest-dbutils-backup_db.yml
index 021c3b1c74..39834920e2 100644
--- a/.github/workflows/pytest-dbutils-backup_db.yml
+++ b/.github/workflows/pytest-dbutils-backup_db.yml
@@ -54,6 +54,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Create output suffix
+        run: |
+            echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
+
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
         uses: volttron/volttron-build-action@v1
@@ -62,12 +66,9 @@ jobs:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}
             test_path: ${{ env.TEST_FILE }}
-            test_output_suffix: ${{ env.TEST_FILE }}
+            test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
 
 #       Archive the results from the pytest to storage.
-      - name: Create output suffix
-        run: |
-          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
       - name: Archive test results
         uses: actions/upload-artifact@v2
         if: always()
diff --git a/.github/workflows/pytest-dbutils-influxdbfuncts.yml b/.github/workflows/pytest-dbutils-influxdbfuncts.yml
index 40b78f0d68..205f50c56d 100644
--- a/.github/workflows/pytest-dbutils-influxdbfuncts.yml
+++ b/.github/workflows/pytest-dbutils-influxdbfuncts.yml
@@ -44,6 +44,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Create output suffix
+        run: |
+          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
+
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
         uses: volttron/volttron-build-action@v1
@@ -52,12 +56,9 @@ jobs:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}
             test_path: ${{ env.TEST_FILE }}
-            test_output_suffix: ${{ env.TEST_FILE }}
+            test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
 
 #       Archive the results from the pytest to storage.
-      - name: Create output suffix
-        run: |
-          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
       - name: Archive test results
         uses: actions/upload-artifact@v2
         if: always()
diff --git a/.github/workflows/pytest-dbutils-mysqlfuncts.yml b/.github/workflows/pytest-dbutils-mysqlfuncts.yml
index f1cb1c6a9d..cc2e324efb 100644
--- a/.github/workflows/pytest-dbutils-mysqlfuncts.yml
+++ b/.github/workflows/pytest-dbutils-mysqlfuncts.yml
@@ -44,6 +44,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Create output suffix
+        run: |
+          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
+
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
         uses: volttron/volttron-build-action@v1
@@ -52,12 +56,9 @@ jobs:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}
             test_path: ${{ env.TEST_FILE }}
-            test_output_suffix: ${{ env.TEST_FILE }}
+            test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
 
 #       Archive the results from the pytest to storage.
-      - name: Create output suffix
-        run: |
-          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
       - name: Archive test results
         uses: actions/upload-artifact@v2
         if: always()
diff --git a/.github/workflows/pytest-dbutils-postgresqlfuncts.yml b/.github/workflows/pytest-dbutils-postgresqlfuncts.yml
index 7679c54604..229d300a1e 100644
--- a/.github/workflows/pytest-dbutils-postgresqlfuncts.yml
+++ b/.github/workflows/pytest-dbutils-postgresqlfuncts.yml
@@ -44,6 +44,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Create output suffix
+        run: |
+          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
+
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
         uses: volttron/volttron-build-action@v1
@@ -52,12 +56,9 @@ jobs:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}
             test_path: ${{ env.TEST_FILE }}
-            test_output_suffix: ${{ env.TEST_FILE }}
+            test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
 
 #       Archive the results from the pytest to storage.
-      - name: Create output suffix
-        run: |
-          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
       - name: Archive test results
         uses: actions/upload-artifact@v2
         if: always()
diff --git a/.github/workflows/pytest-dbutils-sqlitefuncts.yml b/.github/workflows/pytest-dbutils-sqlitefuncts.yml
index fe5c1ed140..8887030fba 100644
--- a/.github/workflows/pytest-dbutils-sqlitefuncts.yml
+++ b/.github/workflows/pytest-dbutils-sqlitefuncts.yml
@@ -44,6 +44,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+#       Archive the results from the pytest to storage.
+      - name: Create output suffix
+        run: |
+          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
+
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
         uses: volttron/volttron-build-action@v1
@@ -52,12 +57,8 @@ jobs:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}
             test_path: ${{ env.TEST_FILE }}
-            test_output_suffix: ${{ env.TEST_FILE }}
+            test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
 
-#       Archive the results from the pytest to storage.
-      - name: Create output suffix
-        run: |
-          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
       - name: Archive test results
         uses: actions/upload-artifact@v2
         if: always()
diff --git a/.github/workflows/pytest-dbutils-timescaldbfuncts.yml b/.github/workflows/pytest-dbutils-timescaldbfuncts.yml
index 02539f5825..9362850218 100644
--- a/.github/workflows/pytest-dbutils-timescaldbfuncts.yml
+++ b/.github/workflows/pytest-dbutils-timescaldbfuncts.yml
@@ -44,6 +44,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Create output suffix
+        run: |
+            echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
+
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
         uses: volttron/volttron-build-action@v1
@@ -52,12 +56,9 @@ jobs:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}
             test_path: ${{ env.TEST_FILE }}
-            test_output_suffix: ${{ env.TEST_FILE }}
+            test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
 
 #       Archive the results from the pytest to storage.
-      - name: Create output suffix
-        run: |
-          echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
       - name: Archive test results
         uses: actions/upload-artifact@v2
         if: always()