diff --git a/Dockerfile b/Dockerfile
index cb23b6cf..1ffce2dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ COPY . .
 RUN go build -o /bin/forwarder .
 
 FROM build as test
-CMD go test -test.v ./... -timeout 2m
+CMD go test -test.v ./...
 
 FROM test as debug
 WORKDIR /build/internal/tests/
diff --git a/internal/tests/suite_setup_test.go b/internal/tests/suite_setup_test.go
index 0eef0dd7..9839f11f 100644
--- a/internal/tests/suite_setup_test.go
+++ b/internal/tests/suite_setup_test.go
@@ -57,7 +57,7 @@ func (f *ForwarderTestSuite) SetupSuite() {
 	logrus.SetFormatter(&nested.Formatter{})
 	logrus.SetLevel(logrus.DebugLevel)
 	log.EnableTracing(true)
-	f.ctx, f.cancel = context.WithTimeout(context.Background(), time.Minute)
+	f.ctx, f.cancel = context.WithCancel(context.Background())
 	f.ctx = log.WithLog(f.ctx, logruslogger.New(f.ctx))
 
 	starttime := time.Now()