diff --git a/string/test/Jamfile.v2 b/string/test/Jamfile.v2
index 364a4db..9d8503c 100644
--- a/string/test/Jamfile.v2
+++ b/string/test/Jamfile.v2
@@ -7,6 +7,8 @@
 #
 #  See http://www.boost.org for updates, documentation, and revision history.
 
+import testing ;
+
 test-suite string_algo
     : [ run
             container_test.cpp
diff --git a/string/test/container_test.cpp b/string/test/container_test.cpp
index 97561e8..1257e35 100644
--- a/string/test/container_test.cpp
+++ b/string/test/container_test.cpp
@@ -7,6 +7,10 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/collection_traits.hpp>
+// equals predicate is used for result comparison
+#include <boost/algorithm/string/predicate.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -14,12 +18,8 @@
 #include <utility>
 #include <vector>
 
-#include <boost/algorithm/string/collection_traits.hpp>
 #include <boost/type_traits.hpp>
 
-// equals predicate is used for result comparison
-#include <boost/algorithm/string/predicate.hpp>
-
 // test tools
 #include <boost/test/test_tools.hpp>
 
diff --git a/string/test/conv_test.cpp b/string/test/conv_test.cpp
index 852e8c0..82f8d8f 100644
--- a/string/test/conv_test.cpp
+++ b/string/test/conv_test.cpp
@@ -7,13 +7,14 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/case_conv.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
 #include <string>
 #include <iostream>
 #include <algorithm>
-#include <boost/algorithm/string/case_conv.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;
diff --git a/string/test/find_test.cpp b/string/test/find_test.cpp
index c1b8baa..417e286 100644
--- a/string/test/find_test.cpp
+++ b/string/test/find_test.cpp
@@ -7,6 +7,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/find.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -15,8 +18,6 @@
 #include <iostream>
 #include <iterator>
 #include <sstream>
-#include <boost/algorithm/string/find.hpp>
-#include <boost/algorithm/string/classification.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;
diff --git a/string/test/predicate_test.cpp b/string/test/predicate_test.cpp
index 644a53f..d2d0f0e 100644
--- a/string/test/predicate_test.cpp
+++ b/string/test/predicate_test.cpp
@@ -7,6 +7,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -14,8 +17,6 @@
 #include <vector>
 #include <iostream>
 #include <functional>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/classification.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;
diff --git a/string/test/regex_test.cpp b/string/test/regex_test.cpp
index c0a0a45..7b9cd00 100644
--- a/string/test/regex_test.cpp
+++ b/string/test/regex_test.cpp
@@ -7,6 +7,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/regex.hpp>
+#include <boost/algorithm/string/sequence_traits.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -14,8 +17,6 @@
 #include <vector>
 #include <iostream>
 #include <boost/regex.hpp>
-#include <boost/algorithm/string/sequence_traits.hpp>
-#include <boost/algorithm/string/regex.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;
diff --git a/string/test/replace_test.cpp b/string/test/replace_test.cpp
index 998fe66..fa61e1a 100644
--- a/string/test/replace_test.cpp
+++ b/string/test/replace_test.cpp
@@ -7,6 +7,11 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/std/list_traits.hpp>
+#include <boost/algorithm/string/std/string_traits.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -15,11 +20,6 @@
 #include <list>
 #include <iostream>
 
-#include <boost/algorithm/string/std/list_traits.hpp>
-#include <boost/algorithm/string/std/string_traits.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/erase.hpp>
-
 // equals predicate is used for result comparison
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/string/test/split_test.cpp b/string/test/split_test.cpp
index 5843534..805ce68 100644
--- a/string/test/split_test.cpp
+++ b/string/test/split_test.cpp
@@ -7,6 +7,11 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+// equals predicate is used for result comparison
+#include <boost/algorithm/string/predicate.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -15,11 +20,6 @@
 #include <iostream>
 
 #include <boost/test/test_tools.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/classification.hpp>
-
-// equals predicate is used for result comparison
-#include <boost/algorithm/string/predicate.hpp>
 
 
 using namespace std;
diff --git a/string/test/trim_test.cpp b/string/test/trim_test.cpp
index 531d48d..ed80c28 100644
--- a/string/test/trim_test.cpp
+++ b/string/test/trim_test.cpp
@@ -7,12 +7,13 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/trim.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
 #include <string>
 #include <iostream>
-#include <boost/algorithm/string/trim.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;