diff --git a/e2e/common/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go
similarity index 100%
rename from e2e/common/dev_mode_test.go
rename to e2e/common/cli/dev_mode_test.go
diff --git a/e2e/common/global_kamelet_test.go b/e2e/common/cli/global_kamelet_test.go
similarity index 100%
rename from e2e/common/global_kamelet_test.go
rename to e2e/common/cli/global_kamelet_test.go
diff --git a/e2e/common/install_test.go b/e2e/common/cli/install_test.go
similarity index 100%
rename from e2e/common/install_test.go
rename to e2e/common/cli/install_test.go
diff --git a/e2e/common/offline_commands_test.go b/e2e/common/cli/offline_commands_test.go
similarity index 100%
rename from e2e/common/offline_commands_test.go
rename to e2e/common/cli/offline_commands_test.go
diff --git a/e2e/common/run_test.go b/e2e/common/cli/run_test.go
similarity index 100%
rename from e2e/common/run_test.go
rename to e2e/common/cli/run_test.go
diff --git a/e2e/common/uninstall_test.go b/e2e/common/cli/uninstall_test.go
similarity index 100%
rename from e2e/common/uninstall_test.go
rename to e2e/common/cli/uninstall_test.go
diff --git a/script/Makefile b/script/Makefile
index f420b43e63..a13bdd2c75 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -166,6 +166,10 @@ test-resources: build
 	STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" go test -timeout 60m -v ./e2e/resources -tags=integration
 	#go test -timeout 60m -v ./e2e/resources -tags=integration
 
+test-kamel-cli: build
+	STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" go test -timeout 60m -v ./e2e/common/cli -tags=integration
+	#go test -timeout 60m -v ./e2e/common/cli -tags=integration
+
 build-kamel:
 	go build $(GOFLAGS) -o kamel ./cmd/kamel/*.go