diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f342f833..a11a1c74 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,7 +44,7 @@ jobs:
            --with-tcp-wrappers
     - name: make
       run: make
-    - name: make check
+    - name: GITHUB_CI=t make check
       run: make check
     - name: make distcheck
       run: DISTCHECK_CONFIGURE_FLAGS=--with-redfishpower make distcheck
diff --git a/t/t0039-llnl-el-capitan-cluster.t b/t/t0039-llnl-el-capitan-cluster.t
index cf0d780d..4abfa7a1 100755
--- a/t/t0039-llnl-el-capitan-cluster.t
+++ b/t/t0039-llnl-el-capitan-cluster.t
@@ -4,6 +4,12 @@ test_description='Check LLNL El Capitan config'
 
 . `dirname $0`/sharness.sh
 
+# Setting the --long option or TEST_LONG=t fulfills the EXPENSIVE prereq
+if ! test_have_prereq EXPENSIVE && ! test -n "$GITHUB_CI"; then
+	skip_all='skipping large scale El Capitan test'
+	test_done
+fi
+
 ulimit -n 2048
 
 powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand