--- a/JavaVM.st	Wed Nov 20 17:31:10 2013 +0000
+++ b/JavaVM.st	Wed Nov 20 23:45:28 2013 +0000
@@ -1767,7 +1767,7 @@
 !
 
 initializeSystemPropertiesInto: props
-    | cpu  cpu2  os |
+    | cpu  cpu2  os dir |
     "/ use JAVA compatible cpu-name
     cpu := OperatingSystem getCPUType.
     cpu2 := cpu.
@@ -1910,8 +1910,9 @@
 
     "/ Java tests, sigh..."
 
-    props at: 'libjava.tests.dir' put: ((Smalltalk getPackageDirectoryForPackage: self package) / 'tests') pathName.
-
+    (dir := Smalltalk getPackageDirectoryForPackage: self package) notNil ifTrue:[
+        props at: 'libjava.tests.dir' put: (dir / 'tests') pathName.
+    ].
     ^ props
 
     "
@@ -1922,7 +1923,7 @@
     "Modified (format): / 03-11-2011 / 12:40:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 21-12-2011 / 23:05:11 / jv"
     "Modified: / 13-09-2012 / 20:33:56 / m"
-    "Modified: / 09-01-2013 / 17:11:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-11-2013 / 23:43:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 initializeVM