diff --git a/test/Jamfile b/test/Jamfile
index 77d1b24..de8c73e 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -10,5 +10,13 @@ import testing ;
        : [ run lexicographic_test.cpp ]
          [ run lex_performance_test.cpp ]
          [ run named_params_test.cpp ]
+	 [ run enable_if_constructors.cpp ]
+         [ run enable_if_member_templates.cpp ]
+         [ run enable_if_dummy_arg_disambiguation.cpp ]
+         [ run enable_if_namespace_disambiguation.cpp ]
+         [ run enable_if_lazy.cpp ]
+         [ run enable_if_no_disambiguation.cpp ]
+         [ run enable_if_lazy_test.cpp ]                
+         [ run enable_if_partial_specializations.cpp ]
        ;
 }
diff --git a/test/enable_if_Makefile b/test/enable_if_Makefile
deleted file mode 100644
index afa125f..0000000
--- a/test/enable_if_Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-CXX = g++ -I${HOME}/boost -I../../..
-
-all: enable_if_constructors.run enable_if_dummy_arg_disambiguation.run enable_if_namespace_disambiguation.run enable_if_no_disambiguation.run enable_if_lazy.run enable_if_member_templates.run enable_if_partial_specializations.run enable_if_lazy_test.run
-
-enable_if_constructors.run: enable_if_constructors.exe
-	./enable_if_constructors.exe
-	touch enable_if_constructors.run
-
-enable_if_constructors.exe: enable_if_constructors.cpp
-	$(CXX) -o enable_if_constructors.exe enable_if_constructors.cpp
-
-enable_if_dummy_arg_disambiguation.run: enable_if_dummy_arg_disambiguation.exe
-	./enable_if_dummy_arg_disambiguation.exe
-	touch enable_if_dummy_arg_disambiguation.run
-
-enable_if_dummy_arg_disambiguation.exe: enable_if_dummy_arg_disambiguation.cpp
-	$(CXX) -o enable_if_dummy_arg_disambiguation.exe enable_if_dummy_arg_disambiguation.cpp
-
-enable_if_namespace_disambiguation.run: enable_if_namespace_disambiguation.exe
-	./enable_if_namespace_disambiguation.exe
-	touch enable_if_namespace_disambiguation.run
-
-enable_if_namespace_disambiguation.exe: enable_if_namespace_disambiguation.cpp
-	$(CXX) -o enable_if_namespace_disambiguation.exe enable_if_namespace_disambiguation.cpp
-
-enable_if_no_disambiguation.run: enable_if_no_disambiguation.exe
-	./enable_if_no_disambiguation.exe
-	touch enable_if_no_disambiguation.run
-
-enable_if_no_disambiguation.exe: enable_if_no_disambiguation.cpp
-	$(CXX) -o enable_if_no_disambiguation.exe enable_if_no_disambiguation.cpp
-
-enable_if_lazy.run: enable_if_lazy.exe
-	./enable_if_lazy.exe
-	touch enable_if_lazy.run
-
-enable_if_lazy.exe: enable_if_lazy.cpp
-	$(CXX) -o enable_if_lazy.exe enable_if_lazy.cpp
-
-enable_if_member_templates.run: enable_if_member_templates.exe
-	./enable_if_member_templates.exe
-	touch enable_if_member_templates.run
-
-enable_if_member_templates.exe: enable_if_member_templates.cpp
-	$(CXX) -o enable_if_member_templates.exe enable_if_member_templates.cpp
-
-enable_if_partial_specializations.run: enable_if_partial_specializations.exe
-	./enable_if_partial_specializations.exe
-	touch enable_if_partial_specializations.run
-
-enable_if_partial_specializations.exe: enable_if_partial_specializations.cpp
-	$(CXX) -o enable_if_partial_specializations.exe enable_if_partial_specializations.cpp
-
-
-enable_if_lazy_test.run: enable_if_lazy_test.exe
-	./enable_if_lazy_test.exe
-	touch enable_if_lazy_test.run
-
-enable_if_lazy_test.exe: enable_if_lazy_test.cpp
-	$(CXX) -o enable_if_lazy_test.exe enable_if_lazy_test.cpp
-
-
-clean:
-	-rm -f enable_if_constructors.run enable_if_dummy_arg_disambiguation.run enable_if_lazy.run enable_if_member_templates.run enable_if_namespace_disambiguation.run enable_if_no_disambiguation.run enable_if_partial_specializations.run enable_if_lazy_test.run enable_if_constructors.exe enable_if_dummy_arg_disambiguation.exe enable_if_lazy.exe enable_if_member_templates.exe enable_if_namespace_disambiguation.exe enable_if_no_disambiguation.exe enable_if_partial_specializations.exe enable_if_lazy_test.exe