--- a/tests/libclient/js-size/main.cpp	Thu Dec 15 13:46:46 2016 +0100
+++ b/tests/libclient/js-size/main.cpp	Fri Dec 16 13:07:44 2016 +0100
@@ -39,11 +39,13 @@
 BOOST_FIXTURE_TEST_SUITE(test_size_suite, test_size)
 
 /*
- * 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,
@@ -67,7 +69,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(Constructor2Args)
+BOOST_AUTO_TEST_CASE(constructor_2_args)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -91,7 +93,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(ConstructorObject)
+BOOST_AUTO_TEST_CASE(constructor_object)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -115,7 +117,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(ConstructorNew)
+BOOST_AUTO_TEST_CASE(constructor_new)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -139,12 +141,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,
@@ -171,7 +177,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(InvalidConstructorRange1)
+BOOST_AUTO_TEST_CASE(constructor_range_1)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -198,7 +204,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(InvalidConstructorRange2)
+BOOST_AUTO_TEST_CASE(constructor_range_2)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -225,7 +231,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(InvalidConstructorRange3)
+BOOST_AUTO_TEST_CASE(constructor_range_3)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -252,7 +258,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(InvalidConstructorRange4)
+BOOST_AUTO_TEST_CASE(constructor_range_4)
 {
     try {
         auto ret = duk_peval_string(m_ctx,
@@ -279,12 +285,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) {
@@ -316,7 +326,7 @@
     }
 }
 
-BOOST_AUTO_TEST_CASE(requireFail)
+BOOST_AUTO_TEST_CASE(fail)
 {
     try {
         duk_push_c_function(m_ctx, [] (auto ctx) {
@@ -350,12 +360,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) {
@@ -388,3 +402,5 @@
 }
 
 BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE_END()