diff --git a/build.sh b/build.sh
index 7f1e485d3..969340a7f 100755
--- a/build.sh
+++ b/build.sh
@@ -240,10 +240,6 @@ if [[ "$TEST_RUST" == 'True' ]]; then
 			eval "$COPY_VALGRINDRC"
 			eval "$VALGRIND_CARGO_COMMAND"
 			date "$STAMP"
-			./test_tool.sh
-			date "$STAMP"
-			eval "$VALGRIND_COMMAND ../target/debug/imageflow_tool diagnose --self-test"
-			date "$STAMP"
 		)
 		if [[ "$IMAGEFLOW_SERVER" == 'True' ]]; then
 			(
@@ -308,6 +304,8 @@ if [[ "$BUILD_RELEASE" == 'True' ]]; then
 		date "$STAMP"
 		cargo build --release
 		cargo doc --no-deps
+		date "$STAMP"
+		../target/release/imageflow_tool diagnose --show-compilation-info
 	)
 	echo "Building libimageflow (Release) and docs"
 	(
diff --git a/imageflow_tool/test_tool.sh b/imageflow_tool/test_tool.sh
deleted file mode 100755
index 1ffe4c40b..000000000
--- a/imageflow_tool/test_tool.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-export RUST_BACKTRACE=1
-cargo build --bin imageflow_tool
-
-TOOL="../target/debug/imageflow_tool"
-
-
-$TOOL --help
-
-$TOOL diagnose --show-compilation-info
-
-$TOOL --version
-$TOOL -V
-
-$TOOL diagnose --self-test
-
-(
-    mkdir _test || true
-    cd _test
-    ../$TOOL examples --generate
-)
\ No newline at end of file