diff --git a/update-test-path b/update-test-path
index c4a8e939e8b2d79dad7d52f25adaf430f3313041..1766cbb093c3e53d9afdcd86a2810e491857eafb 100644
--- a/update-test-path
+++ b/update-test-path
@@ -6,7 +6,10 @@ PATH=${TESTPATH}/common:${TESTPATH}/bin:$PATH
 
 # Path for architecture specific binaries
 case `uname -m` in
-x86_64) PATH=${TESTPATH}/amd64/bin:$PATH; ;;
-armv7l) PATH=${TESTPATH}/armhf/bin:$PATH; ;;
-aarch64) PATH=${TESTPATH}/arm64/bin:$PATH; ;;
+x86_64)  ARCHDIR=amd64 ;;
+armv7l)  ARCHDIR=armhf ;;
+aarch64) ARCHDIR=arm64 ;;
 esac
+
+PATH=${TESTPATH}/${ARCHDIR}/bin:$PATH
+