diff --git a/e2e/common/files/timer-kamelet-usage.groovy b/e2e/common/cli/files/timer-kamelet-usage.groovy
similarity index 100%
rename from e2e/common/files/timer-kamelet-usage.groovy
rename to e2e/common/cli/files/timer-kamelet-usage.groovy
diff --git a/e2e/common/cli/files/yaml.yaml b/e2e/common/cli/files/yaml.yaml
new file mode 100644
index 0000000000..9ccf652734
--- /dev/null
+++ b/e2e/common/cli/files/yaml.yaml
@@ -0,0 +1,28 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+- from:
+    uri: "timer:yaml"
+    parameters:
+      period: "5000"
+    steps:
+      - set-header:
+          name: "m"
+          constant: "string!"
+      - set-body:
+          simple: "Magic${header.m}"
+      - to: "log:info"
diff --git a/script/Makefile b/script/Makefile
index a13bdd2c75..aee8872aad 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -147,8 +147,11 @@ test: build
 	go test ./...
 
 test-integration: build
-	STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" go test -timeout 60m -v ./e2e/common -tags=integration && go test -timeout 60m -v ./e2e/common/languages -tags=integration && go test -timeout 60m -v ./e2e/common/traits -tags=integration
-	#go test -timeout 60m -v ./e2e/common -tags=integration
+	STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \
+	go test -timeout 60m -v ./e2e/common -tags=integration && \
+	go test -timeout 60m -v ./e2e/common/cli -tags=integration && \
+	go test -timeout 60m -v ./e2e/common/languages -tags=integration && \
+	go test -timeout 60m -v ./e2e/common/traits -tags=integration
 
 test-knative: build
 	STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" go test -timeout 60m -v ./e2e/knative -tags=integration