--- a/tests/libclient/js-rectangle/main.cpp	Thu Dec 15 13:46:46 2016 +0100
+++ b/tests/libclient/js-rectangle/main.cpp	Fri Dec 16 13:07:44 2016 +0100
@@ -37,11 +37,13 @@
 BOOST_FIXTURE_TEST_SUITE(test_rectangle_suite, test_rectangle)
 
 /*
- * Valid constructors
+ * Valid constructors.
  * ------------------------------------------------------------------
  */
 
-BOOST_AUTO_TEST_CASE(ConstructorNoArgs)
+BOOST_AUTO_TEST_SUITE(constructors)
+
+BOOST_AUTO_TEST_CASE(constructor_default)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -73,7 +75,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(Constructor4Args)
+BOOST_AUTO_TEST_CASE(constructor_4_args)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -105,7 +107,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(ConstructorObject)
+BOOST_AUTO_TEST_CASE(constructor_object)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -137,7 +139,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(ConstructorNew)
+BOOST_AUTO_TEST_CASE(constructor_new)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -169,12 +171,16 @@
     }
 }
 
+BOOST_AUTO_TEST_SUITE_END()
+
 /*
- * Invalid constructors
+ * Invalid constructors.
  * ------------------------------------------------------------------
  */
 
-BOOST_AUTO_TEST_CASE(InvalidConstructorArg1)
+BOOST_AUTO_TEST_SUITE(invalid_constructors)
+
+BOOST_AUTO_TEST_CASE(constructor_arg_1)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -201,7 +207,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(InvalidConstructorRange1)
+BOOST_AUTO_TEST_CASE(constructor_range_1)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -228,12 +234,16 @@
     }
 }
 
+BOOST_AUTO_TEST_SUITE_END()
+
 /*
  * Require.
  * ------------------------------------------------------------------
  */
 
-BOOST_AUTO_TEST_CASE(requireSuccess)
+BOOST_AUTO_TEST_SUITE(require)
+
+BOOST_AUTO_TEST_CASE(success)
 {
     try {
         duk_push_c_function(m_ctx, [] (auto ctx) {
@@ -275,7 +285,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(requireFail)
+BOOST_AUTO_TEST_CASE(fail)
 {
     try {
         duk_push_c_function(m_ctx, [] (auto ctx) {
@@ -309,12 +319,16 @@
     }
 }
 
+BOOST_AUTO_TEST_SUITE_END()
+
 /*
  * Get.
  * ------------------------------------------------------------------
  */
 
-BOOST_AUTO_TEST_CASE(getAdjustAll)
+BOOST_AUTO_TEST_SUITE(get)
+
+BOOST_AUTO_TEST_CASE(adjust_all)
 {
     try {
         duk_push_c_function(m_ctx, [] (auto ctx) {
@@ -356,3 +370,5 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE_END()