diff --git a/Makefile b/Makefile
index d50874f..33f5d36 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ LDFLAGSSTRING +=-X main.Date=$(BUILD_TIME)
 LDFLAGSSTRING +=-X main.Version=$(GIT_TAG)
 LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
 
-E2EFUZZTEST = go test ./e2e -fuzz -v -fuzztime=30m
+E2EFUZZTEST = FUZZ=true go test ./e2e -fuzz -v -fuzztime=15m
 
 .PHONY: eigenda-proxy
 eigenda-proxy:
diff --git a/e2e/main_test.go b/e2e/main_test.go
index 7889665..c0b397e 100644
--- a/e2e/main_test.go
+++ b/e2e/main_test.go
@@ -24,11 +24,13 @@ import (
 var (
 	runTestnetIntegrationTests bool // holesky tests
 	runIntegrationTests        bool // memstore tests
+	runFuzzTests               bool // fuzz tests
 )
 
 // ParseEnv ... reads testing cfg fields. Go test flags don't work for this library due to the dependency on Optimism's E2E framework
 // which initializes test flags per init function which is called before an init in this package.
 func ParseEnv() {
+	runFuzzTests = os.Getenv("FUZZ") == "true" || os.Getenv("FUZZ") == "1"
 	if runIntegrationTests && runTestnetIntegrationTests {
 		panic("only one of INTEGRATION=true or TESTNET=true env var can be set")
 	}
diff --git a/e2e/server_fuzz_test.go b/e2e/server_fuzz_test.go
index d572e12..6eee212 100644
--- a/e2e/server_fuzz_test.go
+++ b/e2e/server_fuzz_test.go
@@ -13,6 +13,9 @@ import (
 // FuzzProxyClientServerIntegrationAndOpClientKeccak256MalformedInputs will fuzz the proxy client server integration
 // and op client keccak256 with malformed inputs. This is never meant to be fuzzed with EigenDA.
 func FuzzProxyClientServerIntegration(f *testing.F) {
+	if !runFuzzTests {
+		f.Skip("Skipping test as FUZZ env var not set")
+	}
 
 	tsConfig := e2e.TestSuiteConfig(e2e.TestConfig(useMemory()))
 	ts, kill := e2e.CreateTestSuite(tsConfig)