diff --git a/test/main_test.go b/test/main_test.go
index 817fd39a..c9db8362 100644
--- a/test/main_test.go
+++ b/test/main_test.go
@@ -18,6 +18,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -70,7 +71,7 @@ func TestFeatures(t *testing.T) {
 		Options: &godog.Options{
 			Format:      "pretty",
 			Strict:      true,
-			Concurrency: 8,
+			Concurrency: runtime.NumCPU(),
 			Paths:       []string{"features"},
 			TestingT:    t,
 		},