diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 118178a38..477c1e1c8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -112,29 +112,34 @@ jobs:
         kind: Job
         metadata:
           name: nightly-ci-$today
-          namespace: default
         spec:
           template:
             spec:
               containers:
               - name: tests
-                image: ${{ env.DOCKER_SERVER }}/cloud-sdk-nightly:pytest-499077849
+                image: ${{ env.DOCKER_SERVER }}/cloud-sdk-nightly:pytest-${{ github.run_id }}
                 args: 
                 - "-c"
-                - "pytest --no-testrails --skip-update-firmware; echo 'starting sleep'; sleep 300"
+                - "pytest --no-testrails --skip-update-firmware; sleep 300"
                 command: [ "bash" ]
               imagePullSecrets:
               - name: tip-docker-registry-key
               restartPolicy: Never
           backoffLimit: 0
         EOF
-        sleep 120
-        podname=$(kubectl get pods -o name -l job-name=nightly-ci-$today -n default)
-        kubectl cp $podname:/ci/test_everything.xml test_everything.xml -n default
+
+        podname=$(kubectl get pods -o name -l job-name=nightly-ci-$today | sed "s/pod\///")
+        until [ -s test_everything.xml ]
+        do
+          echo "waiting for tests to complete"
+          kubectl cp $podname:/ci/test_everything.xml test_everything.xml
+          sleep 5
+        done
+
         kubectl logs $podname
       shell: bash
     - name: Publish Unit Test Results
       uses: EnricoMi/publish-unit-test-result-action@v1.7
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        files: "**/*.xml"
\ No newline at end of file
+        files: "**/*.xml"
diff --git a/pytest/test_24ghz.py b/pytest/test_24ghz.py
index b845b2010..0f5dd8c11 100644
--- a/pytest/test_24ghz.py
+++ b/pytest/test_24ghz.py
@@ -13,33 +13,31 @@ from sta_connect2 import StaConnect2
 class Test24ghz(object):
     @pytest.mark.featureA
     def test_single_client_wpa2(self, setup_testrails, setup_cloudsdk, update_firmware, instantiate_testrail):
-        pytest.skip("speedup")
-        pass
-        # lf_config = setup_cloudsdk["LANforge"]
-        # radio_config = setup_cloudsdk["24ghz"]
+        lf_config = setup_cloudsdk["LANforge"]
+        radio_config = setup_cloudsdk["24ghz"]
 
-        # staConnect = StaConnect2(lf_config["host"], lf_config["port"], debug_ = False)
-        # staConnect.sta_mode = 0
-        # staConnect.upstream_resource = 1
-        # staConnect.upstream_port = lf_config["eth_port"]
-        # staConnect.radio = lf_config["radio"]
-        # staConnect.runtime_secs = lf_config["runtime_duration"]
-        # staConnect.resource = 1
-        # staConnect.dut_ssid = radio_config["ssid"]
-        # staConnect.dut_passwd = radio_config["password"]
-        # staConnect.dut_security = "wpa2"
-        # staConnect.station_names = radio_config["station_names"]
-        # staConnect.bringup_time_sec = 60
-        # staConnect.cleanup_on_exit = True
-        # staConnect.setup()
-        # staConnect.start()
-        # sleep(staConnect.runtime_secs)
-        # staConnect.stop()
-        # staConnect.cleanup()
+        staConnect = StaConnect2(lf_config["host"], lf_config["port"], debug_ = False)
+        staConnect.sta_mode = 0
+        staConnect.upstream_resource = 1
+        staConnect.upstream_port = lf_config["eth_port"]
+        staConnect.radio = lf_config["radio"]
+        staConnect.runtime_secs = lf_config["runtime_duration"]
+        staConnect.resource = 1
+        staConnect.dut_ssid = radio_config["ssid"]
+        staConnect.dut_passwd = radio_config["password"]
+        staConnect.dut_security = "wpa2"
+        staConnect.station_names = radio_config["station_names"]
+        staConnect.bringup_time_sec = 60
+        staConnect.cleanup_on_exit = True
+        staConnect.setup()
+        staConnect.start()
+        sleep(staConnect.runtime_secs)
+        staConnect.stop()
+        staConnect.cleanup()
 
-        # assert staConnect.passes()
-        # if setup_testrails > 0:
-        #     instantiate_testrail.update_testrail(case_id=2835, run_id=setup_testrails, status_id=1, msg="testing")
+        assert staConnect.passes()
+        if setup_testrails > 0:
+            instantiate_testrail.update_testrail(case_id=2835, run_id=setup_testrails, status_id=1, msg="testing")
 
     @pytest.mark.featureB
     def test_feature_b(self):
@@ -47,11 +45,11 @@ class Test24ghz(object):
 
     @pytest.mark.featureC
     def test_feature_c(self):
-        pass
+        assert 1 == 0
 
     @pytest.mark.featureD
     def test_feature_d(self):
-        pass
+        pytest.skip("speedup")
 
     @pytest.mark.xfail
     @pytest.mark.featureE