diff --git a/update-test-path b/update-test-path
index 5141b3d57884686c2f7d09bcbd9ef6e7ed0384de..c4a8e939e8b2d79dad7d52f25adaf430f3313041 100644
--- a/update-test-path
+++ b/update-test-path
@@ -1,5 +1,10 @@
-PATH=${TESTPATH}/common:${TESTPATH}/bin:$PATH
+# Current test directory extracted from pwd
 TESTPATH=$(pwd)
+
+# Path for architecture independant binaries
+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; ;;