diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b039a40..9a5a146 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,7 @@ jobs:
         run: |
           make test
 
+  # TODO: Add this back once we have a working version of v0.50.0 with ITS and v0.47.x
   # test-integration:
   #   runs-on: ubuntu-latest
   #   timeout-minutes: 25
diff --git a/block/base/lane.go b/block/base/lane.go
index 2275326..a9bc87e 100644
--- a/block/base/lane.go
+++ b/block/base/lane.go
@@ -64,10 +64,6 @@ func NewBaseLane(
 		matchHandler: matchHandlerFn,
 	}
 
-	if err := lane.ValidateBasic(); err != nil {
-		panic(err)
-	}
-
 	return lane
 }
 
diff --git a/lanes/base/lane.go b/lanes/base/lane.go
index e197df5..8f2a1f9 100644
--- a/lanes/base/lane.go
+++ b/lanes/base/lane.go
@@ -35,6 +35,10 @@ func NewDefaultLane(cfg base.LaneConfig) *DefaultLane {
 		base.DefaultMatchHandler(),
 	)
 
+	if err := lane.ValidateBasic(); err != nil {
+		panic(err)
+	}
+
 	return &DefaultLane{
 		BaseLane: lane,
 	}
diff --git a/lanes/free/lane.go b/lanes/free/lane.go
index 678aa3a..ac679fa 100644
--- a/lanes/free/lane.go
+++ b/lanes/free/lane.go
@@ -37,6 +37,10 @@ func NewFreeLane(
 		matchFn,
 	)
 
+	if err := lane.ValidateBasic(); err != nil {
+		panic(err)
+	}
+
 	return &FreeLane{
 		BaseLane: lane,
 	}
diff --git a/lanes/mev/lane.go b/lanes/mev/lane.go
index d03d27a..cfa69e5 100644
--- a/lanes/mev/lane.go
+++ b/lanes/mev/lane.go
@@ -68,5 +68,9 @@ func NewMEVLane(
 	// Set the check order handler to the TOB one
 	lane.SetCheckOrderHandler(lane.CheckOrderHandler())
 
+	if err := lane.ValidateBasic(); err != nil {
+		panic(err)
+	}
+
 	return lane
 }