diff --git a/.github/workflows/build-checks.yaml b/.github/workflows/build-checks.yaml
index 004c8b34c3..b09a6d168e 100644
--- a/.github/workflows/build-checks.yaml
+++ b/.github/workflows/build-checks.yaml
@@ -115,7 +115,7 @@ jobs:
       - name: Skip tests that depend on virtualization capable runners when needed
         if: ${{ endsWith(inputs.instance, '-arm') }}
         run: |
-          echo "GITHUB_RUNNER_CI_ARM64=true" >> "$GITHUB_ENV"
+          echo "GITHUB_RUNNER_CI_NON_VIRT=true" >> "$GITHUB_ENV"
       - name: Running `${{ matrix.command }}` for ${{ matrix.component.name }}
         run: |
           cd ${{ matrix.component.path }}
diff --git a/src/runtime/cmd/kata-runtime/kata-check_arm64_test.go b/src/runtime/cmd/kata-runtime/kata-check_arm64_test.go
index f11e922084..eca7d159fd 100644
--- a/src/runtime/cmd/kata-runtime/kata-check_arm64_test.go
+++ b/src/runtime/cmd/kata-runtime/kata-check_arm64_test.go
@@ -25,7 +25,7 @@ func setupCheckHostIsVMContainerCapable(assert *assert.Assertions, cpuInfoFile s
 }
 
 func TestCCCheckCLIFunction(t *testing.T) {
-	if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" {
+	if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
 		t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
 	}
 
diff --git a/src/runtime/cmd/kata-runtime/kata-env_arm64_test.go b/src/runtime/cmd/kata-runtime/kata-env_arm64_test.go
index 1c6de1af71..145def067d 100644
--- a/src/runtime/cmd/kata-runtime/kata-env_arm64_test.go
+++ b/src/runtime/cmd/kata-runtime/kata-env_arm64_test.go
@@ -18,7 +18,7 @@ func getExpectedHostDetails(tmpdir string) (HostInfo, error) {
 }
 
 func TestEnvGetEnvInfoSetsCPUType(t *testing.T) {
-	if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" {
+	if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
 		t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
 	}
 	testEnvGetEnvInfoSetsCPUTypeGeneric(t)
diff --git a/src/runtime/cmd/kata-runtime/kata-env_test.go b/src/runtime/cmd/kata-runtime/kata-env_test.go
index 2057a177a6..b2cc4387f7 100644
--- a/src/runtime/cmd/kata-runtime/kata-env_test.go
+++ b/src/runtime/cmd/kata-runtime/kata-env_test.go
@@ -375,7 +375,7 @@ func TestEnvGetMetaInfo(t *testing.T) {
 }
 
 func TestEnvGetHostInfo(t *testing.T) {
-	if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" {
+	if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
 		t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
 	}
 
@@ -439,7 +439,7 @@ func TestEnvGetHostInfoNoProcVersion(t *testing.T) {
 }
 
 func TestEnvGetEnvInfo(t *testing.T) {
-	if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" {
+	if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
 		t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
 	}
 
@@ -471,7 +471,7 @@ func TestEnvGetEnvInfo(t *testing.T) {
 }
 
 func TestEnvGetEnvInfoNoHypervisorVersion(t *testing.T) {
-	if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" {
+	if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
 		t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
 	}