diff --git a/.github/scripts/run-tests b/.github/scripts/run-tests
index f983cb46a3957..6fb3ea1bec350 100755
--- a/.github/scripts/run-tests
+++ b/.github/scripts/run-tests
@@ -55,8 +55,21 @@ for TEST in "${TESTS_TO_RUN[@]}"
 do
     LOCAL_SUCCESS=0
     RESULT_XML=$(echo ${TEST} | sed -e "s/${TEST_DIR}/${RESULTS_DIR}/" | sed -e "s/.py/.xml/")
-    pytest --junitxml=${RESULT_XML} ${TEST} || LOCAL_SUCCESS=$?
+
+    # this is a bit messy and brittle, but certain tests
+    # need to be run with specific options
+    if [[ "${TEST}" == *"kernels"* ]]; then
+        CUDA_VISIBLE_DEVICES=0 pytest --junitxml=${RESULT_XML} ${TEST} || LOCAL_SUCCESS=$?
+    elif [[ "${TEST}" == *"samplers"* ]]; then
+        CUDA_VISIBLE_DEVICES=0 pytest --junitxml=${RESULT_XML} ${TEST} || LOCAL_SUCCESS=$?
+    elif [[ "${TEST}" == *"distributed"* ]]; then
+        pytest --forked --junitxml=${RESULT_XML} ${TEST} || LOCAL_SUCCESS=$?
+    else
+        pytest --junitxml=${RESULT_XML} ${TEST} || LOCAL_SUCCESS=$?
+    fi
+
     SUCCESS=$((SUCCESS + LOCAL_SUCCESS))
+
 done
 
 if [ "${SUCCESS}" -eq "0" ]; then
diff --git a/tests/distributed/test_basic_distributed_correctness.py b/tests/distributed/test_basic_distributed_correctness.py
index 021f36865541a..82075356fccbd 100644
--- a/tests/distributed/test_basic_distributed_correctness.py
+++ b/tests/distributed/test_basic_distributed_correctness.py
@@ -5,10 +5,9 @@
 import pytest
 import torch
 
-# TODO: just picking one, need to update test runner to selectively use "--forked"
 MODELS = [
     "facebook/opt-125m",
-    # "meta-llama/Llama-2-7b-hf",
+    "meta-llama/Llama-2-7b-hf",
 ]