diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6ad1d09..7e5a787d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,33 +157,8 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/format-benchmark/tinyformat_test.cpp)
     COMMAND @time -p ./tinyformat_speed_test boost > /dev/null
     DEPENDS tinyformat_speed_test)
 
-  add_custom_target(bloat_test_debug
-    COMMAND echo running bloat tests...
-    COMMAND echo printf results:
-    COMMAND ./bloat_test.sh
-    COMMAND echo iostreams results:
-    COMMAND ./bloat_test.sh -DUSE_IOSTREAMS
-    COMMAND echo format results:
-    COMMAND ./bloat_test.sh -DUSE_CPPFORMAT -L.. -lformat
-    COMMAND echo tinyformat results:
-    COMMAND ./bloat_test.sh -DUSE_TINYFORMAT
-    COMMAND echo boost results:
-    COMMAND ./bloat_test.sh -DUSE_BOOST
-    WORKING_DIRECTORY format-benchmark
-    DEPENDS format)
-
-  add_custom_target(bloat_test_optimized
-    COMMAND echo running bloat tests...
-    COMMAND echo printf results:
-    COMMAND ./bloat_test.sh -O3
-    COMMAND echo iostreams results:
-    COMMAND ./bloat_test.sh -O3 -DUSE_IOSTREAMS
-    COMMAND echo format results:
-    COMMAND ./bloat_test.sh -O3 -DUSE_CPPFORMAT -L.. -lformat
-    COMMAND echo tinyformat results:
-    COMMAND ./bloat_test.sh -O3 -DUSE_TINYFORMAT
-    COMMAND echo boost results:
-    COMMAND ./bloat_test.sh -O3 -DUSE_BOOST
+  add_custom_target(bloat-test
+    COMMAND ./bloat-test.py
     WORKING_DIRECTORY format-benchmark
     DEPENDS format)
 endif ()
diff --git a/README.rst b/README.rst
index 9bb71011..49c842b8 100644
--- a/README.rst
+++ b/README.rst
@@ -327,7 +327,7 @@ the speed test::
 
 or the bloat test::
 
-    $ make bloat_test
+    $ make bloat-test
 
 License
 -------
diff --git a/format-benchmark b/format-benchmark
index 7f2b4345..057e5a9b 160000
--- a/format-benchmark
+++ b/format-benchmark
@@ -1 +1 @@
-Subproject commit 7f2b43454cb09717913f2a2db17837276da9d0bf
+Subproject commit 057e5a9b853a3930cdf674c3ac1eacf670dd3b56