diff --git a/jetson_containers/container.py b/jetson_containers/container.py
index d37c1d59b..5c0b21e17 100644
--- a/jetson_containers/container.py
+++ b/jetson_containers/container.py
@@ -295,9 +295,11 @@ def test_container(name, package, simulate=False):
         cmd += f"--volume {package['path']}:/test" + _NEWLINE_
         cmd += f"--volume {os.path.join(_PACKAGE_ROOT, 'data')}:/data" + _NEWLINE_
         cmd += f"--workdir /test" + _NEWLINE_
-        cmd += f"--entrypoint '/bin/bash -c'" + _NEWLINE_
+        cmd += f"--entrypoint ''" + _NEWLINE_
         cmd += name + _NEWLINE_
-                
+        
+        cmd += "/bin/bash -c '"
+        
         if test_ext == ".py":
             cmd += f"python3 {test}"
         elif test_ext == ".sh":
@@ -305,7 +307,7 @@ def test_container(name, package, simulate=False):
         else:
             cmd += f"{test}"
         
-        cmd += _NEWLINE_
+        cmd += "'" + _NEWLINE_
         cmd += f"2>&1 | tee {log_file + '.txt'}" + "; exit ${PIPESTATUS[0]}"
                 
         print(f"-- Testing container {name} ({package['name']}/{test})")