diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
index c06232b1..23bd73d7 100644
--- a/.github/workflows/container-tests.yml
+++ b/.github/workflows/container-tests.yml
@@ -19,7 +19,7 @@ jobs:
 
     if: |
       github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
+      && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-upstream]') || contains(github.event.comment.body, '[test-all]'))
       && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
     steps:
       - uses: sclorg/tfaga-wrapper@main
diff --git a/test/run b/test/run
index 1104a421..434110d2 100755
--- a/test/run
+++ b/test/run
@@ -30,7 +30,6 @@ test_init_wrapper_false_development
 "
 
 TEST_LIST_BINARY="\
-test_run_binary_application
 test_node_cmd_development_init_wrapper_true
 "
 
diff --git a/test/run-upstream b/test/run-upstream
index 16a779ea..8c54d857 100755
--- a/test/run-upstream
+++ b/test/run-upstream
@@ -27,6 +27,7 @@ test_client_cloudevents
 test_client_fastify
 test_client_pino
 test_client_langchainjs
+test_run_binary_application
 "
 
 readonly EXPRESS_REVISION="${EXPRESS_REVISION:-$(docker run --rm "${IMAGE_NAME}" -- npm show express version)}"
diff --git a/test/test-lib-nodejs.sh b/test/test-lib-nodejs.sh
index 1487f825..e9277d9a 100644
--- a/test/test-lib-nodejs.sh
+++ b/test/test-lib-nodejs.sh
@@ -522,45 +522,32 @@ function test_dev_mode_true_development() {
 }
 
 function test_node_cmd_production_init_wrapper_false() {
-  if [ "$OS" != "rhel7" ]; then
-    # NODE_ENV=production INIT_WRAPPER=false NODE_CMD="node server.js"
-    test_node_cmd app production false "node server.js"
-  fi
+  test_node_cmd app production false "node server.js"
 }
 
 function test_node_cmd_development_init_wrapper_true() {
-  if [ "$OS" != "rhel7" ]; then
-    # NODE_ENV=development INIT_WRAPPER=true NODE_CMD="node server.js"
-    test_node_cmd app development true "node server.js"
-  fi
+  # NODE_ENV=development INIT_WRAPPER=true NODE_CMD="node server.js"
+  test_node_cmd app development true "node server.js"
 }
 
 function test_node_cmd_production_init_wrapper_true() {
-  if [ "$OS" != "rhel7" ]; then
-    # NODE_ENV=production INIT_WRAPPER=true NODE_CMD="node server.js"
-    test_node_cmd app production true "node server.js"
-  fi
+  # NODE_ENV=production INIT_WRAPPER=true NODE_CMD="node server.js"
+  test_node_cmd app production true "node server.js"
 }
 
 function test_node_cmd_development_init_wrapper_false() {
-  if [ "$OS" != "rhel7" ]; then
-    # NODE_ENV=development INIT_WRAPPER=false NODE_CMD="node server.js"
-    test_node_cmd app development false "node server.js"
-  fi
+  # NODE_ENV=development INIT_WRAPPER=false NODE_CMD="node server.js"
+  test_node_cmd app development false "node server.js"
 }
 
 function test_init_wrapper_true_development() {
-  if [ "$OS" != "rhel7" ]; then
-    # NODE_ENV=development INIT_WRAPPER=true
-    test_node_cmd app development true
-  fi
+  # NODE_ENV=development INIT_WRAPPER=true
+  test_node_cmd app development true
 }
 
 function test_init_wrapper_false_development() {
-  if [ "$OS" != "rhel7" ]; then
-    # NODE_ENV=development INIT_WRAPPER=true
-    test_node_cmd app development false
-  fi
+  # NODE_ENV=development INIT_WRAPPER=true
+  test_node_cmd app development false
 }
 
 function test_dev_mode_false_development() {
@@ -707,6 +694,7 @@ function cleanup() {
   if image_exists ${IMAGE_NAME}-testapp; then
     docker rmi -f ${IMAGE_NAME}-testapp
   fi
+	return 0
 }
 
 # vim: set tabstop=2:shiftwidth=2:expandtab: