diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog
index 8994a45093..b181221453 100644
--- a/testsuites/psxtests/ChangeLog
+++ b/testsuites/psxtests/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-16	Sebastian Huber <Sebastian.Huber@embedded-brains.de>
+
+	* psxfile01/test.c: Avoid NULL pointer access.
+
 2010-07-15	Bharath Suri <bharath.s.jois@gmail.com>
 
 	PR 1617/testing
diff --git a/testsuites/psxtests/psxfile01/test.c b/testsuites/psxtests/psxfile01/test.c
index e376b8fe05..8d6183560b 100644
--- a/testsuites/psxtests/psxfile01/test.c
+++ b/testsuites/psxtests/psxfile01/test.c
@@ -339,10 +339,10 @@ int main(
   rtems_test_assert( fd == -1 );
   rtems_test_assert( errno == EINVAL );
 
-  puts( "Exercise the reentrant version _link_r -- Expect EFAULT" );
-  status = _link_r( NULL, NULL, NULL );
+  puts( "Exercise the reentrant version _link_r -- Expect EEXIST" );
+  status = _link_r( NULL, "", "" );
   rtems_test_assert( status == -1 );
-  rtems_test_assert( errno == EFAULT );
+  rtems_test_assert( errno == EEXIST );
 
   puts( "Unlink /tmp/bha using the reentrant version -- OK" );
   status = _unlink_r( NULL, "/tmp/bha" );