diff --git a/src/tests/normal-tests/compiler.lsp b/src/tests/normal-tests/compiler.lsp
index addb731c2..305816804 100644
--- a/src/tests/normal-tests/compiler.lsp
+++ b/src/tests/normal-tests/compiler.lsp
@@ -967,7 +967,7 @@
   (let ((indices (funcall (compile nil
                                    '(lambda ()
                                      (ffi:c-inline () () list "
-        union cl_lispunion x[0];
+        union cl_lispunion x[1];
         cl_index bytecodes = (char*)(&(x->bytecodes.entry)) - (char*)x;
         cl_index bclosure  = (char*)(&(x->bclosure.entry)) - (char*)x;
         cl_index cfun      = (char*)(&(x->cfun.entry)) - (char*)x;
diff --git a/src/tests/normal-tests/embedding.lsp b/src/tests/normal-tests/embedding.lsp
index 641e795a2..5254eada3 100644
--- a/src/tests/normal-tests/embedding.lsp
+++ b/src/tests/normal-tests/embedding.lsp
@@ -18,12 +18,12 @@
   (c::linker-cc "tmp/ecl-aux.exe" '("tmp/ecl-aux.o"))
   (ecase capture-output
     ((nil)
-     (return-from test-C-program (zerop (si::system #+mingw32 (format nil "PATH=%PATH%;~a tmp\\ecl-aux.exe" c::*ecl-library-directory*)
-                                                    #-mingw32 "tmp/ecl-aux.exe"))))
+     (return-from test-C-program (zerop (si::system #+windows (format nil "PATH=%PATH%;~a tmp\\ecl-aux.exe" c::*ecl-library-directory*)
+                                                    #-windows "tmp/ecl-aux.exe"))))
     ((string :string)
      (with-output-to-string (s)
        (let ((in (si::run-program "tmp/ecl-aux.exe" '() :output :stream
-                                  :environ (append #+mingw32 (list (format nil "PATH=~a;~a"
+                                  :environ (append #+windows (list (format nil "PATH=~a;~a"
                                                                            (ext:getenv "PATH")
                                                                            c::*ecl-library-directory*))
                                                    (ext:environ))))
@@ -36,7 +36,7 @@
      (do* ((all '())
            (x t)
            (in (si::run-program "tmp/ecl-aux.exe" '() :output :stream
-                                :environ (append #+mingw32 (list (format nil "PATH=~a;~a"
+                                :environ (append #+windows (list (format nil "PATH=~a;~a"
                                                                          (ext:getenv "PATH")
                                                                          c::*ecl-library-directory*))
                                                  (ext:environ)))))
diff --git a/src/tests/normal-tests/foreign-interface.lsp b/src/tests/normal-tests/foreign-interface.lsp
index dec21bef4..b1a026a2a 100644
--- a/src/tests/normal-tests/foreign-interface.lsp
+++ b/src/tests/normal-tests/foreign-interface.lsp
@@ -25,7 +25,7 @@
 #-ecl-bytecmp
 (test ffi.0001.callback
   (is
-   (and (zerop (si::system "rm -rf tmp; mkdir tmp"))
+   (and (ensure-directories-exist "tmp/")
         (with-open-file (s "tmp/a.lsp" :direction :output
                            :if-exists :supersede
                            :if-does-not-exist :create)
@@ -39,8 +39,7 @@
         (c:build-program "tmp/foo" :lisp-files
                          (list (compile-file-pathname "tmp/a.lsp" :type :object)
                                (compile-file-pathname "tmp/b.lsp" :type :object)))
-        (probe-file (compile-file-pathname "tmp/foo" :type :program))
-        (zerop (si::system "rm -rf tmp")))))
+        (probe-file (compile-file-pathname "tmp/foo" :type :program)))))
 
 ;;; Date: 29/07/2008
 ;;; From: Juajo
@@ -50,7 +49,7 @@
 #-ecl-bytecmp
 (test ffi.0002.callback-sffi-example
   (is
-   (and (zerop (si::system "rm -rf tmp; mkdir tmp"))
+   (and (ensure-directories-exist "tmp/")
         (with-open-file (s "tmp/c.lsp" :direction :output
                            :if-exists :supersede
                            :if-does-not-exist :create)
@@ -79,7 +78,7 @@ int (*foo)(int) = (int (*)(int))#0;
 #+(and (or) dffi (not ecl-bytecmp))
 (test ffi.0003.callback-dffi-example
   (is
-   (and (zerop (si::system "rm -rf tmp; mkdir tmp"))
+   (and (ensure-directories-exist "tmp/")
         (with-open-file (s "tmp/c.lsp" :direction :output
                            :if-exists :supersede
                            :if-does-not-exist :create)