diff --git a/test/rtree/rtree_exceptions.cpp b/test/rtree/rtree_exceptions.cpp
index 3e43c8c53..35c6ef80c 100644
--- a/test/rtree/rtree_exceptions.cpp
+++ b/test/rtree/rtree_exceptions.cpp
@@ -38,10 +38,6 @@ void test_rtree_value_exceptions(Parameters const& parameters = Parameters())
     }
 }
 
-//#define _CRTDBG_MAP_ALLOC
-//#include <stdlib.h>
-//#include <crtdbg.h>
-
 int test_main(int, char* [])
 {
     test_rtree_value_exceptions< bgi::linear<4, 2> >();
@@ -51,9 +47,5 @@ int test_main(int, char* [])
     test_rtree_value_exceptions< bgi::rstar<4, 2> >();
     test_rtree_value_exceptions(bgi::runtime::rstar(4, 2));
 
-    //std::cout << "----------------------------------------\n";
-    //_CrtDumpMemoryLeaks();
-    //std::cin.get();
-
     return 0;
 }
diff --git a/test/rtree/test_rtree_exceptions.hpp b/test/rtree/test_rtree_exceptions.hpp
index 20e6fefbe..74c58c823 100644
--- a/test/rtree/test_rtree_exceptions.hpp
+++ b/test/rtree/test_rtree_exceptions.hpp
@@ -161,7 +161,7 @@ struct allocators<Allocator, Value, Parameters, Box, node_throwing_d_mem_static_
 
 struct internal_node_bad_alloc : public std::exception
 {
-    const char * what() { return "internal node creation failed."; }
+    const char * what() const throw() { return "internal node creation failed."; }
 };
 
 // create_node
@@ -196,7 +196,7 @@ struct create_node<
 
 struct leaf_bad_alloc : public std::exception
 {
-    const char * what() { return "leaf node creation failed."; }
+    const char * what() const throw() { return "leaf node creation failed."; }
 };
 
 template <typename Allocators, typename Value, typename Parameters, typename Box>
@@ -235,7 +235,7 @@ struct create_node<
 
 struct throwing_value_copy_exception : public std::exception
 {
-    const char * what() { return "value copy failed."; }
+    const char * what() const throw() { return "value copy failed."; }
 };
 
 struct throwing_value