diff --git a/src/test/confidence/testenv.sh b/src/test/confidence/testenv.sh
index 5d331aa1..f62a3ce8 100755
--- a/src/test/confidence/testenv.sh
+++ b/src/test/confidence/testenv.sh
@@ -21,6 +21,6 @@ rm -f *.o *.obj *.exe *.sym *.c *.h result
 # on the voc command and calling 'as' explicitly.
 # NOTE 2: The cygwin 64 bit build has relocation errors with
 # these assembly generation options.
-if [ $COMPILER=gcc -a $FLAVOUR!=cygwin.LP64.gcc ]
+if [ "$COMPILER" = "gcc" -a "$FLAVOUR" != "cygwin.LP64.gcc" ]
 then export CFLAGS="-gstabs -g1 -Wa,-acdhln=new.asm"
 fi
diff --git a/src/tools/make/vishap.make b/src/tools/make/vishap.make
index 256a69ee..62d90166 100644
--- a/src/tools/make/vishap.make
+++ b/src/tools/make/vishap.make
@@ -376,11 +376,11 @@ sourcechanges:
 
 confidence:
 	@printf "\n\n--- Confidence tests ---\n\n"
-	cd src/test/confidence/hello;           FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
-	cd src/test/confidence/language;        FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
-	if [ "$(PLATFORM)" != "windows" ] ; then cd src/test/confidence/signal; FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"; fi
-	cd src/test/confidence/lola;            FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
-	cd src/test/confidence/arrayassignment; FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
+	cd src/test/confidence/hello;           COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
+	cd src/test/confidence/language;        COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
+	if [ "$(PLATFORM)" != "windows" ] ; then cd src/test/confidence/signal; COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"; fi
+	cd src/test/confidence/lola;            COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
+	cd src/test/confidence/arrayassignment; COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
 	@printf "\n\n--- Confidence tests passed ---\n\n"