diff --git a/Makefile b/Makefile
index c6113cff..faade6a1 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ lint:
 	@golangci-lint --exclude=SA1019 run ./... --deadline=5m
 
 test:
-	${GOBIN} test -timeout 300s ./waku/... -coverprofile=${GO_TEST_OUTFILE}.tmp
+	${GOBIN} test ./waku/... -coverprofile=${GO_TEST_OUTFILE}.tmp
 	cat ${GO_TEST_OUTFILE}.tmp | grep -v ".pb.go" > ${GO_TEST_OUTFILE}
 	${GOBIN} tool cover -html=${GO_TEST_OUTFILE} -o ${GO_HTML_COV}
 
@@ -158,6 +158,6 @@ start-ganache:
 stop-ganache:
 	docker stop ganache-cli
 
-test-rln:
-	go test -timeout 30s -v -count 1 github.com/status-im/go-waku/waku/v2/protocol/rln
-	
\ No newline at end of file
+test-onchain:
+	${GOBIN} test -v -count 1 -tags="include_onchain_tests" github.com/status-im/go-waku/waku/v2/protocol/rln
+
diff --git a/waku/v2/protocol/rln/onchain_test.go b/waku/v2/protocol/rln/onchain_test.go
index 237c0a12..610a4099 100644
--- a/waku/v2/protocol/rln/onchain_test.go
+++ b/waku/v2/protocol/rln/onchain_test.go
@@ -1,3 +1,6 @@
+//go:build include_onchain_tests
+// +build include_onchain_tests
+
 package rln
 
 import (