diff --git a/bootfs.manifest b/bootfs.manifest
index e6de628a51f0da4b13a167b74791e6f56f2fa4e9..9c865743b83aaac045a4957e6c2a945db7e63d25 100644
--- a/bootfs.manifest
+++ b/bootfs.manifest
@@ -16,6 +16,6 @@
 /tests/tst-pthread.so: ./tests/tst-pthread.so
 /tests/tst-malloc.so: ../../external/glibc-testsuite/build/debug/malloc/tst-malloc.so
 /tests/tst-getcwd.so: ../../external/glibc-testsuite/build/debug/io/tst-getcwd.so
-/tests/Hello.class: ./tests/hello/Hello.class
+/java/Hello.class: ./tests/hello/Hello.class
 /java.so: java.so
 #/tests/read01.so: ../../external/ltp/build/debug/syscalls/read/read01.so
diff --git a/fs/vfs/main.c b/fs/vfs/main.c
index a9897cba66ca0f753d73d3e9880c28abaa619533..47b8f09c99ca912132237f968aab753d2dd766fe 100755
--- a/fs/vfs/main.c
+++ b/fs/vfs/main.c
@@ -973,6 +973,7 @@ void unpack_bootfs(void)
 		"/usr/lib/jvm/jre/lib",
 		"/usr/lib/jvm/jre/lib/amd64",
 		"/usr/lib/jvm/jre/lib/amd64/server",
+		"/java",
 		"/tests",
 		NULL,
 	};
diff --git a/java.cc b/java.cc
index b90f0eff4cf247d181daf1cfdc4b0d1299d47a2b..5d2edffb1c2da89f9db04cf27aa4ed1949893512 100644
--- a/java.cc
+++ b/java.cc
@@ -23,7 +23,7 @@ int main(int ac, char **av)
     vm_args.version = JNI_VERSION_1_6;
     JNI_GetDefaultJavaVMInitArgs(&vm_args);
     std::vector<JavaVMOption> options;
-    options.push_back(mkoption("-Djava.class.path=/tests"));
+    options.push_back(mkoption("-Djava.class.path=/java"));
     while (ac > 0 && av[0][0] == '-') {
         options.push_back(mkoption(av[0]));
         ++av, --ac;