diff --git a/test/Jamfile b/test/Jamfile
index 587a493..f0fd7b6 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -15,7 +15,8 @@
 subproject libs/optional/test ;
 
 # bring in rules for testing
-import testing ;
+SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
+include testing.jam ;
 
 # Make tests run by default.
 DEPENDS all : test ;
@@ -26,11 +27,19 @@ DEPENDS all : test ;
 
   test-suite optional :
     [ run libs/optional/test/optional_test.cpp ]
+    [ run libs/optional/test/optional_test_tie.cpp ]
+    [ run libs/optional/test/optional_test_references.cpp ]
+    [ run libs/optional/test/optional_test_inplace.cpp ]
     [ compile-fail libs/optional/test/optional_test_fail1.cpp ]
     [ compile-fail libs/optional/test/optional_test_fail2.cpp ]
-    [ compile-fail libs/optional/test/optional_test_fail3.cpp ]
-    [ compile-fail libs/optional/test/optional_test_fail4.cpp ]
-    [ compile-fail libs/optional/test/optional_test_fail5a.cpp ]
-    [ compile-fail libs/optional/test/optional_test_fail5b.cpp ]
+    [ compile-fail libs/optional/test/optional_test_fail3a.cpp ]
+    [ compile-fail libs/optional/test/optional_test_fail3b.cpp ]
+    [ compile-fail libs/optional/test/optional_test_references_fail1a.cpp ]
+    [ compile-fail libs/optional/test/optional_test_references_fail1b.cpp ]
+    [ compile-fail libs/optional/test/optional_test_references_fail1c.cpp ]
+    [ compile-fail libs/optional/test/optional_test_references_fail2.cpp ]
+    [ compile-fail libs/optional/test/optional_test_references_fail3.cpp ]
+    [ compile-fail libs/optional/test/optional_test_references_fail4.cpp ]
+    [ compile-fail libs/optional/test/optional_test_inplace_fail.cpp ]
   ;
 }