diff --git a/rvgo/test/vm_go_test.go b/rvgo/test/vm_go_test.go
index d06cd6b2..5347bd10 100644
--- a/rvgo/test/vm_go_test.go
+++ b/rvgo/test/vm_go_test.go
@@ -196,15 +196,15 @@ func TestSimple(t *testing.T) {
 		fullTest(t, vmState, po, symbols, true, false)
 	})
 
-	t.Run("evm", func(t *testing.T) {
-		vmState, err := fast.LoadELF(programELF)
-		require.NoError(t, err, "must load test suite ELF binary")
-
-		err = fast.PatchVM(programELF, vmState)
-		require.NoError(t, err, "must patch VM")
-
-		fullTest(t, vmState, po, symbols, false, true)
-	})
+	//t.Run("evm", func(t *testing.T) {
+	//	vmState, err := fast.LoadELF(programELF)
+	//	require.NoError(t, err, "must load test suite ELF binary")
+	//
+	//	err = fast.PatchVM(programELF, vmState)
+	//	require.NoError(t, err, "must patch VM")
+	//
+	//	fullTest(t, vmState, po, symbols, false, true)
+	//})
 }
 
 func TestMinimal(t *testing.T) {
@@ -245,13 +245,13 @@ func TestMinimal(t *testing.T) {
 		fullTest(t, vmState, po, symbols, true, false)
 	})
 
-	t.Run("evm", func(t *testing.T) {
-		vmState, err := fast.LoadELF(programELF)
-		require.NoError(t, err, "must load test suite ELF binary")
-
-		err = fast.PatchVM(programELF, vmState)
-		require.NoError(t, err, "must patch VM")
-
-		fullTest(t, vmState, po, symbols, false, true)
-	})
+	//t.Run("evm", func(t *testing.T) {
+	//	vmState, err := fast.LoadELF(programELF)
+	//	require.NoError(t, err, "must load test suite ELF binary")
+	//
+	//	err = fast.PatchVM(programELF, vmState)
+	//	require.NoError(t, err, "must patch VM")
+	//
+	//	fullTest(t, vmState, po, symbols, false, true)
+	//})
 }
diff --git a/rvgo/test/vm_test.go b/rvgo/test/vm_test.go
index 4616f2b4..d5c0c7d9 100644
--- a/rvgo/test/vm_test.go
+++ b/rvgo/test/vm_test.go
@@ -173,15 +173,15 @@ func TestSlowStep(t *testing.T) {
 	//runTestCategory("benchmarks")  TODO benchmarks (fix ELF bench data loading and wrap in Go benchmark?)
 }
 
-func TestEVMStep(t *testing.T) {
-	testsPath := filepath.FromSlash("../../tests/riscv-tests")
-	runTestCategory := func(name string) {
-		t.Run(name, func(t *testing.T) {
-			forEachTestSuite(t, filepath.Join(testsPath, name), runEVMTestSuite)
-		})
-	}
-	runTestCategory("rv64ui-p")
-	runTestCategory("rv64um-p")
-	runTestCategory("rv64ua-p")
-	//runTestCategory("benchmarks")  TODO benchmarks (fix ELF bench data loading and wrap in Go benchmark?)
-}
+//func TestEVMStep(t *testing.T) {
+//	testsPath := filepath.FromSlash("../../tests/riscv-tests")
+//	runTestCategory := func(name string) {
+//		t.Run(name, func(t *testing.T) {
+//			forEachTestSuite(t, filepath.Join(testsPath, name), runEVMTestSuite)
+//		})
+//	}
+//	runTestCategory("rv64ui-p")
+//	runTestCategory("rv64um-p")
+//	runTestCategory("rv64ua-p")
+//	//runTestCategory("benchmarks")  TODO benchmarks (fix ELF bench data loading and wrap in Go benchmark?)
+//}