diff --git a/src/compiler/OPV.Mod b/src/compiler/OPV.Mod
index b49ac12a..5eda54ff 100644
--- a/src/compiler/OPV.Mod
+++ b/src/compiler/OPV.Mod
@@ -292,9 +292,8 @@ MODULE OPV;  (* J. Templ 16.2.95 / 3.7.96
 
   PROCEDURE SizeCast(size: LONGINT);
   BEGIN
-    IF    size <= OPM.SIntSize THEN OPM.WriteString("(int)")     (* TODO: int for temporary source comparison only. *)
-    ELSIF size <= OPM.IntSize  THEN OPM.WriteString("(int)")     (* TODO: int for temporary source comparison only. *)
-    ELSE                            OPM.WriteString("(LONGINT)")
+    IF size <= 4 THEN OPM.WriteString("(int)")
+    ELSE              OPM.WriteString("(SYSTEM_INT64)")
     END
   END SizeCast;
 
diff --git a/src/system/SYSTEM.h b/src/system/SYSTEM.h
index 7ea8b8de..7a4ca5f8 100644
--- a/src/system/SYSTEM.h
+++ b/src/system/SYSTEM.h
@@ -9,6 +9,8 @@
   #include <string.h>  // For memcpy ...
   #include <stdint.h>  // For uintptr_t ...
 
+  typedef long SYSTEM_INT64;
+
 #else
 
   // Building for Windows platform with either mingw under cygwin, or the MS C compiler
@@ -20,8 +22,9 @@
     typedef unsigned int uintptr_t;
   #endif /* _WIN64 */
 
+  typedef long long SYSTEM_INT64
   typedef unsigned int uint32_t;
-  void * __cdecl memcpy(void * dest, const void * source, size_t size);
+  void * __cdecl memcpy(void *dest, const void *source, size_t size);
 
 #endif
 
diff --git a/src/test/confidence/arrayassignment/test.sh b/src/test/confidence/arrayassignment/test.sh
index 9f4206e2..115040ef 100755
--- a/src/test/confidence/arrayassignment/test.sh
+++ b/src/test/confidence/arrayassignment/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 . ../testenv.sh
-voc aa.mod -m
+$OBECOMP aa.mod -m
 ./aa >result
 . ../testresult.sh
diff --git a/src/test/confidence/hello/test.sh b/src/test/confidence/hello/test.sh
index 4ebe71c3..e49e2b2a 100755
--- a/src/test/confidence/hello/test.sh
+++ b/src/test/confidence/hello/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 . ../testenv.sh
-voc hello.mod -m
+$OBECOMP hello.mod -m
 ./hello >result
 . ../testresult.sh
diff --git a/src/test/confidence/intsyntax/test.sh b/src/test/confidence/intsyntax/test.sh
index 5702749a..7699daea 100644
--- a/src/test/confidence/intsyntax/test.sh
+++ b/src/test/confidence/intsyntax/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 . ../testenv.sh
 # Generate mixed source and assembly code listing
-voc IntSyntax.mod -m >result
+$OBECOMP IntSyntax.mod -m >result
 . ../testresult.sh
diff --git a/src/test/confidence/language/test.sh b/src/test/confidence/language/test.sh
index 217e6c49..82f3efbf 100755
--- a/src/test/confidence/language/test.sh
+++ b/src/test/confidence/language/test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 . ../testenv.sh
 # Generate mixed source and assembly code listing
-voc TestLanguage.mod -m
+$OBECOMP TestLanguage.mod -m
 ./TestLanguage >result
 . ../testresult.sh
diff --git a/src/test/confidence/library/test.sh b/src/test/confidence/library/test.sh
index 62605c10..e59c074c 100644
--- a/src/test/confidence/library/test.sh
+++ b/src/test/confidence/library/test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 . ../testenv.sh
 # Generate mixed source and assembly code listing
-voc TestLibrary.mod -m
+$OBECOMP TestLibrary.mod -m
 ./TestLibrary >result
 . ../testresult.sh
diff --git a/src/test/confidence/lola/test.sh b/src/test/confidence/lola/test.sh
index 523dd7bb..315d6d8e 100755
--- a/src/test/confidence/lola/test.sh
+++ b/src/test/confidence/lola/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 . ../testenv.sh
-voc LSS.Mod LSB.Mod LSC.Mod LSV.Mod lola.Mod -m
+$OBECOMP LSS.Mod LSB.Mod LSC.Mod LSV.Mod lola.Mod -m
 ./Lola RISC5.Lola result
 . ../testresult.sh
diff --git a/src/test/confidence/signal/test.sh b/src/test/confidence/signal/test.sh
index 8e507edc..fadc1879 100755
--- a/src/test/confidence/signal/test.sh
+++ b/src/test/confidence/signal/test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 . ../testenv.sh
-voc signal.mod -m
+$OBECOMP signal.mod -m
 ./SignalTest x &
 sleep 1
 kill -2 $!
diff --git a/src/tools/make/vishap.make b/src/tools/make/vishap.make
index 3498320f..3ad06768 100644
--- a/src/tools/make/vishap.make
+++ b/src/tools/make/vishap.make
@@ -378,7 +378,7 @@ sourcechanges:
 
 
 
-RUNTEST = COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
+RUNTEST = COMPILER=$(COMPILER) OBECOMP=$(VISHAP) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
 
 confidence:
 	@printf "\n\n--- Confidence tests ---\n\n"