diff --git a/test/callbacks.cpp b/test/callbacks.cpp
index ee305553..6675bd41 100644
--- a/test/callbacks.cpp
+++ b/test/callbacks.cpp
@@ -2,7 +2,6 @@
 // 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)
-#include <boost/assert.hpp>
 
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
@@ -13,6 +12,7 @@
 #include <boost/python/reference_existing_object.hpp>
 #include <boost/python/call.hpp>
 #include <boost/python/object.hpp>
+#include <boost/assert.hpp>
 
 using namespace boost::python;
 BOOST_STATIC_ASSERT(converter::is_object_manager<handle<> >::value);
diff --git a/test/list.cpp b/test/list.cpp
index d9c47a62..08037fd0 100644
--- a/test/list.cpp
+++ b/test/list.cpp
@@ -2,8 +2,6 @@
 // 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)
-#include <boost/assert.hpp>
-
 
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
@@ -11,6 +9,7 @@
 #include <boost/python/list.hpp>
 #include <boost/python/make_function.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/assert.hpp>
 #include "test_class.hpp"
 
 using namespace boost::python;
diff --git a/test/module_tail.cpp b/test/module_tail.cpp
index 594949ef..02cfc6a3 100644
--- a/test/module_tail.cpp
+++ b/test/module_tail.cpp
@@ -32,7 +32,7 @@ extern "C" void (*old_translator)(unsigned, EXCEPTION_POINTERS*)
 #include <boost/python/str.hpp>
 struct test_failure : std::exception
 {
-    test_failure(char const* expr, char const* function, char const* file, unsigned line)
+    test_failure(char const* expr, char const* /*function*/, char const* file, unsigned line)
       : msg(file + boost::python::str(":%s:") % line + ": Boost.Python assertion failure: " + expr)
     {}
 
diff --git a/test/staticmethod.cpp b/test/staticmethod.cpp
index 0501c7c5..76728af8 100644
--- a/test/staticmethod.cpp
+++ b/test/staticmethod.cpp
@@ -2,7 +2,6 @@
 // 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)
-#include <boost/assert.hpp>
 
 #include <boost/python/class.hpp>
 #include <boost/python/module.hpp>
@@ -10,6 +9,7 @@
 #include <boost/python/call_method.hpp>
 #include <boost/ref.hpp>
 #include <boost/utility.hpp>
+#include <boost/assert.hpp>
 
 using namespace boost::python;