diff --git a/src/tests/kits/storage/Jamfile b/src/tests/kits/storage/Jamfile
index 58b1321c59..7dd79a11f2 100644
--- a/src/tests/kits/storage/Jamfile
+++ b/src/tests/kits/storage/Jamfile
@@ -4,6 +4,7 @@ UsePrivateHeaders storage ;
 
 CommonTestLib libstoragetest.so
 	: StorageKitTestAddon.cpp
+		AppFileInfoTest.cpp
 		BasicTest.cpp
 		DirectoryTest.cpp
 		EntryTest.cpp
@@ -11,6 +12,7 @@ CommonTestLib libstoragetest.so
 		FileTest.cpp
 		MimeSnifferTest.cpp
 		MimeTypeTest.cpp
+		NodeInfoTest.cpp
 		NodeTest.cpp
 		PathTest.cpp
 		QueryTest.cpp
diff --git a/src/tests/kits/storage/StorageKitTestAddon.cpp b/src/tests/kits/storage/StorageKitTestAddon.cpp
index 3d303e1c13..7dd5edd700 100644
--- a/src/tests/kits/storage/StorageKitTestAddon.cpp
+++ b/src/tests/kits/storage/StorageKitTestAddon.cpp
@@ -2,12 +2,14 @@
 #include <TestSuiteAddon.h>
 
 // ##### Include headers for your tests here #####
+#include "AppFileInfoTest.h"
 #include "DirectoryTest.h"
 #include "EntryTest.h"
 #include "FileTest.h"
 #include "FindDirectoryTest.h"
 #include "MimeSnifferTest.h"
 #include "MimeTypeTest.h"
+#include "NodeInfoTest.h"
 #include "NodeTest.h"
 #include "PathTest.h"
 #include "QueryTest.h"
@@ -19,11 +21,13 @@ BTestSuite* getTestSuite() {
 	BTestSuite *suite = new BTestSuite("Storage");
 
 	// ##### Add test suites here #####
+	suite->addTest("BAppFileInfo", AppFileInfoTest::Suite());
 	suite->addTest("BDirectory", DirectoryTest::Suite());
 	suite->addTest("BEntry", EntryTest::Suite());
 	suite->addTest("BFile", FileTest::Suite());
 	suite->addTest("BMimeType", MimeTypeTest::Suite());
 	suite->addTest("BNode", NodeTest::Suite());
+	suite->addTest("BNodeInfo", NodeInfoTest::Suite());
 	suite->addTest("BPath", PathTest::Suite());
 	suite->addTest("BQuery", QueryTest::Suite());
 	suite->addTest("BResources", ResourcesTest::Suite());