diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index c7257ac4c..c0cdb703f 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1122,7 +1122,7 @@ CHICKEN_SHAREDLIBOPTS = @CHICKENSHAREDLIB@  $(SYSLIBS)
 CHICKEN_CFLAGS = @CHICKENOPTS@
 CHICKENOPTS = -quiet
 CHICKEN_MAIN =
-CHICKEN_SCRIPT = $(RUNME).ss
+CHICKEN_SCRIPT = $(RUNME).scm
 
 # SWIG produces $(ISRCS) (the C wrapper file)
 # and $(CHICKEN_GENERATED_SCHEME) (the Scheme wrapper file):
@@ -1208,7 +1208,7 @@ chicken_externalhdr:
 # -----------------------------------------------------------------
 
 chicken_run:
-	$(RUNTOOL) $(CHICKEN_CSI) $(CHICKEN_SCRIPT) $(RUNPIPE)
+	env LD_LIBRARY_PATH=. $(RUNTOOL) $(CHICKEN_CSI) $(CHICKEN_SCRIPT) $(RUNPIPE)
 
 # -----------------------------------------------------------------
 # Version display
diff --git a/Examples/chicken/class/Makefile b/Examples/chicken/class/Makefile
index 976651e94..1436d836f 100644
--- a/Examples/chicken/class/Makefile
+++ b/Examples/chicken/class/Makefile
@@ -10,27 +10,27 @@ CFLAGS      =
 VARIANT     =
 
 # uncomment the following lines to build a static exe (only pick one of the CHICKEN_MAIN lines)
-#CHICKEN_MAIN = test-lowlevel-class.scm
-#CHICKEN_MAIN = test-tinyclos-class.scm
+#CHICKEN_MAIN = runme-lowlevel.scm
+#CHICKEN_MAIN = runme-tinyclos.scm
 #VARIANT      = _static
 
 check: build
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-lowlevel-class.scm
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-tinyclos-class.scm
+	$(MAKE) -f $(TOP)/Makefile CHICKEN_SCRIPT='runme-lowlevel.scm' chicken_run
+	$(MAKE) -f $(TOP)/Makefile CHICKEN_SCRIPT='runme-tinyclos.scm' chicken_run
 
 build: $(TARGET) $(TARGET)_proxy
 
 $(TARGET): $(INTERFACE) $(SRCS)
 	$(MAKE) -f $(TOP)/Makefile \
-		SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
-		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
+	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
+	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
+	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
 
 $(TARGET)_proxy: $(INTERFACE) $(SRCS)
 	$(MAKE) -f $(TOP)/Makefile \
-		SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
-		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT) -proxy' TARGET='$(TARGET)_proxy' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
+	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
+	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT) -proxy' TARGET='$(TARGET)_proxy' \
+	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
 
 clean:
 	$(MAKE) -f $(TOP)/Makefile chicken_clean
diff --git a/Examples/chicken/class/test-lowlevel-class.scm b/Examples/chicken/class/runme-lowlevel.scm
similarity index 100%
rename from Examples/chicken/class/test-lowlevel-class.scm
rename to Examples/chicken/class/runme-lowlevel.scm
diff --git a/Examples/chicken/class/test-tinyclos-class.scm b/Examples/chicken/class/runme-tinyclos.scm
similarity index 100%
rename from Examples/chicken/class/test-tinyclos-class.scm
rename to Examples/chicken/class/runme-tinyclos.scm
diff --git a/Examples/chicken/constants/Makefile b/Examples/chicken/constants/Makefile
index 41ca7ae11..31e39d346 100644
--- a/Examples/chicken/constants/Makefile
+++ b/Examples/chicken/constants/Makefile
@@ -10,19 +10,19 @@ CFLAGS      =
 VARIANT     = 
 
 # uncomment the following two lines to build a static exe
-#CHICKEN_MAIN = test-constants.scm
+#CHICKEN_MAIN = runme.scm
 #VARIANT      = _static
 
 check: build
-	csi test-constants.scm
+	$(MAKE) -f $(TOP)/Makefile chicken_run
 
 build: $(TARGET)
 
 $(TARGET): $(INTERFACE) $(SRCS)
 	$(MAKE) -f $(TOP)/Makefile \
-		SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
-		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
+	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
+	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
+	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
 
 clean:
 	$(MAKE) -f $(TOP)/Makefile chicken_clean
diff --git a/Examples/chicken/constants/test-constants.scm b/Examples/chicken/constants/runme.scm
similarity index 100%
rename from Examples/chicken/constants/test-constants.scm
rename to Examples/chicken/constants/runme.scm
diff --git a/Examples/chicken/multimap/Makefile b/Examples/chicken/multimap/Makefile
index 4ae5a9cf3..eba36169d 100644
--- a/Examples/chicken/multimap/Makefile
+++ b/Examples/chicken/multimap/Makefile
@@ -10,19 +10,19 @@ CFLAGS      =
 VARIANT     = 
 
 # uncomment the following two lines to build a static exe
-#CHICKEN_MAIN = test-multimap.scm
+#CHICKEN_MAIN = runme.scm
 #VARIANT      = _static
 
 check: build
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-multimap.scm
+	$(MAKE) -f $(TOP)/Makefile chicken_run
 
 build: $(TARGET)
 
 $(TARGET): $(INTERFACE) $(SRCS)
 	$(MAKE) -f $(TOP)/Makefile \
-		SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
-		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
+	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
+	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
+	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
 
 clean:
 	$(MAKE) -f $(TOP)/Makefile chicken_clean
diff --git a/Examples/chicken/multimap/test-multimap.scm b/Examples/chicken/multimap/runme.scm
similarity index 97%
rename from Examples/chicken/multimap/test-multimap.scm
rename to Examples/chicken/multimap/runme.scm
index 3a6b46e2c..ebe644004 100644
--- a/Examples/chicken/multimap/test-multimap.scm
+++ b/Examples/chicken/multimap/runme.scm
@@ -1,4 +1,3 @@
-;; run with './multimap test-multimap.scm'
 ;; feel free to uncomment and comment sections
 
 (load-library 'example "multimap.so")
diff --git a/Examples/chicken/overload/Makefile b/Examples/chicken/overload/Makefile
index 584fa52a2..e15352ec5 100644
--- a/Examples/chicken/overload/Makefile
+++ b/Examples/chicken/overload/Makefile
@@ -10,19 +10,19 @@ CFLAGS      =
 VARIANT     = 
 
 # uncomment the following lines to build a static exe
-#CHICKEN_MAIN = test-overload.scm
+#CHICKEN_MAIN = runme.scm
 #VARIANT      = _static
 
 check: build
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-overload.scm
+	$(MAKE) -f $(TOP)/Makefile chicken_run
 
 build: $(TARGET)
 
 $(TARGET): $(INTERFACE) $(SRCS)
 	$(MAKE) -f $(TOP)/Makefile \
-		SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
-		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
+	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
+	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
+	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
 
 clean:
 	$(MAKE) -f $(TOP)/Makefile chicken_clean
diff --git a/Examples/chicken/overload/test-overload.scm b/Examples/chicken/overload/runme.scm
similarity index 100%
rename from Examples/chicken/overload/test-overload.scm
rename to Examples/chicken/overload/runme.scm
diff --git a/Examples/chicken/simple/Makefile b/Examples/chicken/simple/Makefile
index 1b03497cd..f8fb006a4 100644
--- a/Examples/chicken/simple/Makefile
+++ b/Examples/chicken/simple/Makefile
@@ -10,19 +10,19 @@ CFLAGS      =
 VARIANT     = 
 
 # uncomment the following two lines to build a static exe
-#CHICKEN_MAIN = test-simple.scm
+#CHICKEN_MAIN = runme.scm
 #VARIANT      = _static
 
 check: build
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-simple.scm
+	$(MAKE) -f $(TOP)/Makefile chicken_run
 
 build: $(TARGET)
 
 $(TARGET): $(INTERFACE) $(SRCS)
 	$(MAKE) -f $(TOP)/Makefile \
-		SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
-		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
+	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
+	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
+	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
 
 clean:
 	$(MAKE) -f $(TOP)/Makefile chicken_clean
diff --git a/Examples/chicken/simple/test-simple.scm b/Examples/chicken/simple/runme.scm
similarity index 100%
rename from Examples/chicken/simple/test-simple.scm
rename to Examples/chicken/simple/runme.scm