diff --git a/index.html b/index.html
index aea70a6..29ea0d2 100644
--- a/index.html
+++ b/index.html
@@ -161,7 +161,7 @@ std::for_each(c.begin(), c.end(),
 
   <h3>Compiler Compatibility</h3>
 
-  <p>The header and <a href="function_test.cpp">test program</a> have been
+  <p>The header and <a href="test/function_test.cpp">test program</a> have been
   compiled with the following compilers:</p>
 
   <table border="1" cellpadding="5" summary="">
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
new file mode 100644
index 0000000..dbe379c
--- /dev/null
+++ b/test/Jamfile.v2
@@ -0,0 +1,9 @@
+#~ Copyright Rene Rivera 2008
+#~ Distributed under the Boost Software License, Version 1.0.
+#~ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+import testing ;
+
+test-suite functional :
+    [ run function_test.cpp ]
+    ;
diff --git a/function_test.cpp b/test/function_test.cpp
similarity index 100%
rename from function_test.cpp
rename to test/function_test.cpp