diff --git a/ChangeLog b/ChangeLog
index 32c3b0d7a..9460b371c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-12 Yavor Doganov  <yavor@gnu.org>
+
+	* Tests/GNUmakefile:
+	* Tests/base/Functions/NSGeometry1.m:
+	* Tests/base/NSRunLoop/performers.m:
+	Tweaks for running in sandbox (bug #42740)
+
 2014-07-07  Yunqiang Su  <wzssyqa@gmail.com>  (tiny change)
 
 	* config/config.trampoline.c:
@@ -11,7 +18,7 @@
 	to the empty string to avoid linking the tools against
 	external libraries.
 	
-2014-07-13 Yavor Doganov  <yavor@gnu.org>
+2014-06-30 Yavor Doganov  <yavor@gnu.org>
 
 	* base.make.in: make base dependencies explicit only when statically
 	linnking (bug #42423)
diff --git a/Tests/GNUmakefile b/Tests/GNUmakefile
index b2027fb5a..49f6bd6b0 100644
--- a/Tests/GNUmakefile
+++ b/Tests/GNUmakefile
@@ -63,7 +63,7 @@ check::
 	ADDITIONAL_INCLUDE_DIRS="-I$(TOP_DIR)/Headers -I$(TOP_DIR)/Source/$(GNUSTEP_TARGET_DIR)";\
 	ADDITIONAL_LIB_DIRS="-L$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\
 	LD_LIBRARY_PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):${LD_LIBRARY_PATH}";\
-	PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):${PATH}";\
+	PATH="$(TOP_DIR)/Tools/$(GNUSTEP_OBJ_DIR):${PATH}";\
 	export GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES;\
 	export ADDITIONAL_INCLUDE_DIRS;\
 	export ADDITIONAL_LIB_DIRS;\
diff --git a/Tests/base/Functions/NSGeometry1.m b/Tests/base/Functions/NSGeometry1.m
index 88eb31806..e7d7f17c7 100644
--- a/Tests/base/Functions/NSGeometry1.m
+++ b/Tests/base/Functions/NSGeometry1.m
@@ -105,11 +105,14 @@ geom_string()
   PASS((EQ(s2.width, s.width) && EQ(s2.height, s.height)), 
        "Can read output of NSStringFromSize");
 
-  dflt = [NSUserDefaults standardUserDefaults];
-  [dflt setBool: YES forKey: @"GSMacOSXCompatible"];
-  [NSUserDefaults resetStandardUserDefaults];
-  PASS((MacOSXCompatibleGeometry() == YES), 
-       "In MacOSX geometry compat mode");
+  if ([[NSFileManager defaultManager] isWritableFileAtPath: NSHomeDirectory()])
+    {
+      dflt = [NSUserDefaults standardUserDefaults];
+      [dflt setBool: YES forKey: @"GSMacOSXCompatible"];
+      [NSUserDefaults resetStandardUserDefaults];
+      PASS((MacOSXCompatibleGeometry() == YES),
+	   "In MacOSX geometry compat mode");
+    }
 #endif
 
   sp = NSStringFromPoint(p);
diff --git a/Tests/base/NSRunLoop/performers.m b/Tests/base/NSRunLoop/performers.m
index 39c970dc0..47761a399 100644
--- a/Tests/base/NSRunLoop/performers.m
+++ b/Tests/base/NSRunLoop/performers.m
@@ -5,12 +5,13 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSArray.h>
 #import <Foundation/NSFileHandle.h>
+#import <Foundation/NSDictionary.h>
 
 #include <unistd.h>
 
 int main()
 {
-  NSAutoreleasePool   *arp = [NSAutoreleasePool new];
+  START_SET("NSRunLoop performers")
   NSRunLoop *run;
   NSDate *date;
   NSMutableString *str;
@@ -45,6 +46,8 @@ int main()
   date = [NSDate dateWithTimeIntervalSinceNow: delay];
   [run runUntilDate: date];
   [run runUntilDate: date];
+  if ([str isEqual: @""])
+    SKIP("it looks like stdin is redirected")
   PASS([str isEqual: @"foo"],
        "-performSelector:target:argument:order:modes: only sends the message once");
   
@@ -107,6 +110,6 @@ int main()
   [fh closeFile];
   [fh release];
 
-  [arp release]; arp = nil;
+  END_SET("NSRunLoop performers")
   return 0;
 }