diff --git a/template/python3-flask-armhf/Dockerfile b/template/python3-flask-armhf/Dockerfile
index 8a606e9..4aaa15f 100644
--- a/template/python3-flask-armhf/Dockerfile
+++ b/template/python3-flask-armhf/Dockerfile
@@ -36,11 +36,7 @@ RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
-RUN if [ "$TEST_ENABLED" == "false" ]; then \
-    echo "skipping tests";\
-    else \
-    eval "$TEST_COMMAND"; \
-    fi
+RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
 
 WORKDIR /home/app/
 
diff --git a/template/python3-flask-debian/Dockerfile b/template/python3-flask-debian/Dockerfile
index b61fa80..e8d4702 100644
--- a/template/python3-flask-debian/Dockerfile
+++ b/template/python3-flask-debian/Dockerfile
@@ -42,11 +42,7 @@ RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
-RUN if [ "$TEST_ENABLED" == "false" ]; then \
-    echo "skipping tests";\
-    else \
-    eval "$TEST_COMMAND"; \
-    fi
+RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
 
 WORKDIR /home/app/
 
diff --git a/template/python3-flask/Dockerfile b/template/python3-flask/Dockerfile
index da57878..43d3bcf 100644
--- a/template/python3-flask/Dockerfile
+++ b/template/python3-flask/Dockerfile
@@ -42,11 +42,7 @@ RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
-RUN if [ "$TEST_ENABLED" == "false" ]; then \
-    echo "skipping tests";\
-    else \
-    eval "$TEST_COMMAND"; \
-    fi
+RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
 
 WORKDIR /home/app/
 
diff --git a/template/python3-http-armhf/Dockerfile b/template/python3-http-armhf/Dockerfile
index b5df88c..e43539d 100644
--- a/template/python3-http-armhf/Dockerfile
+++ b/template/python3-http-armhf/Dockerfile
@@ -34,11 +34,7 @@ RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
-RUN if [ "$TEST_ENABLED" == "false" ]; then \
-    echo "skipping tests";\
-    else \
-    eval "$TEST_COMMAND"; \
-    fi
+RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
 
 WORKDIR /home/app/
 
diff --git a/template/python3-http-debian/Dockerfile b/template/python3-http-debian/Dockerfile
index 20ccee8..624fb03 100644
--- a/template/python3-http-debian/Dockerfile
+++ b/template/python3-http-debian/Dockerfile
@@ -37,11 +37,7 @@ RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
-RUN if [ "$TEST_ENABLED" == "false" ]; then \
-    echo "skipping tests";\
-    else \
-    eval "$TEST_COMMAND"; \
-    fi
+RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
 
 WORKDIR /home/app/
 
@@ -55,4 +51,4 @@ ENV upstream_url="http://127.0.0.1:5000"
 
 HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
 
-CMD ["fwatchdog"]
\ No newline at end of file
+CMD ["fwatchdog"]
diff --git a/template/python3-http/Dockerfile b/template/python3-http/Dockerfile
index d269785..b3526a2 100644
--- a/template/python3-http/Dockerfile
+++ b/template/python3-http/Dockerfile
@@ -40,11 +40,7 @@ RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
-RUN if [ "$TEST_ENABLED" == "false" ]; then \
-    echo "skipping tests";\
-    else \
-    eval "$TEST_COMMAND"; \
-    fi
+RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
 
 WORKDIR /home/app/