diff --git a/Changes b/Changes
index 539324890..05c37f9b0 100644
--- a/Changes
+++ b/Changes
@@ -15,6 +15,8 @@ indicates the contributor was also the author of the fix; Thanks!
 
 ****  Fix tracing of package variables and real arrays.
 
+****  Fix Mac OS-X test issues. [Holger Waechtler]
+
 ****  Fix C++-2011 warnings.
 
 
diff --git a/src/V3File.cpp b/src/V3File.cpp
index 3cb29d57f..100e187c4 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -30,7 +30,7 @@
 #include <memory>
 #include <map>
 
-#if defined(__unix__)
+#if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
 # define INFILTER_PIPE  // Allow pipe filtering.  Needs fork()
 #endif
 
diff --git a/test_regress/t/t_flag_ldflags.pl b/test_regress/t/t_flag_ldflags.pl
index 2a52f5bcd..4d7b59aa1 100755
--- a/test_regress/t/t_flag_ldflags.pl
+++ b/test_regress/t/t_flag_ldflags.pl
@@ -16,7 +16,7 @@ $Self->_run (cmd=>["cd $Self->{obj_dir}"
 	     check_finished=>0);
 $Self->_run (cmd=>["cd $Self->{obj_dir}"
 		   ." && g++ -fPIC -c ../../t/t_flag_ldflags_so.cpp"
-		   ." && ld -shared -o t_flag_ldflags_so.so -lc t_flag_ldflags_so.o"],
+		   ." && g++ -shared -o t_flag_ldflags_so.so -lc t_flag_ldflags_so.o"],
 	     check_finished=>0);
 
 compile (