diff --git a/src/tests/kits/locale/Jamfile b/src/tests/kits/locale/Jamfile
index f28d9c43cd..1634affb51 100644
--- a/src/tests/kits/locale/Jamfile
+++ b/src/tests/kits/locale/Jamfile
@@ -12,7 +12,7 @@ Depends LocaleKitTests
 	collatorSpeed
 	collatorTest
 	localeTest
-#	NumberFormatTests
+	libNumberFormatTests.so
 	;
 
 rule LocaleTest
@@ -35,14 +35,4 @@ Addon catalogTestAddOn
 	: be liblocale.so 
 	;
 
-# For the unit tests we need liblocale.so to live in the `lib' subdirectory
-# of the UnitTester application. We simply create a symlink that can be
-# referred to by `<unittests>liblocale.so'.
-#{
-#	local symlink = <unittests>liblocale.so ;
-#	MakeLocate $(symlink) : [ FDirName $(LOCALE_UNITTESTS_DIR) lib ] ;
-#	RelSymLink $(symlink) : liblocale.so ;
-#}
-
-# TODO: activate this again, once it's working!
-# SubInclude HAIKU_TOP src tests kits locale number_format ;
+SubInclude HAIKU_TOP src tests kits locale number_format ;
diff --git a/src/tests/kits/locale/number_format/Jamfile b/src/tests/kits/locale/number_format/Jamfile
index ac1a18a155..d4d28cd0fb 100644
--- a/src/tests/kits/locale/number_format/Jamfile
+++ b/src/tests/kits/locale/number_format/Jamfile
@@ -4,12 +4,12 @@ UsePublicHeaders locale ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) generic_number_format ] ;
 
-UnitTest NumberFormatTests
+UnitTestLib libNumberFormatTests.so
 	: NumberFormatTestAddOn.cpp
 
 	  # BGenericNumberFormat
 	  GenericNumberFormatTests.cpp
 	  GenericNumberFormatConstructorTest.cpp
 
-	: be liblocale.so
+	: be $(TARGET_LIBSTDC++) liblocale.so
 ;
diff --git a/src/tests/kits/locale/number_format/NumberFormatTestAddOn.cpp b/src/tests/kits/locale/number_format/NumberFormatTestAddOn.cpp
index 6fd6fefda8..6c3fbf5742 100644
--- a/src/tests/kits/locale/number_format/NumberFormatTestAddOn.cpp
+++ b/src/tests/kits/locale/number_format/NumberFormatTestAddOn.cpp
@@ -4,13 +4,12 @@
 #include "generic_number_format/GenericNumberFormatTests.h"
 
 // getTestSuite
-_EXPORT
 BTestSuite*
 getTestSuite()
 {
 	BTestSuite *suite = new BTestSuite("NumberFormat");
 
 	suite->addTest("BGenericNumberFormat", GenericNumberFormatTestSuite());
-	
+
 	return suite;
 }