diff --git a/builds/cmake/ci_build.sh b/builds/cmake/ci_build.sh
index 791e2bf9..b87d9c1d 100755
--- a/builds/cmake/ci_build.sh
+++ b/builds/cmake/ci_build.sh
@@ -2,6 +2,19 @@
 
 set -x
 
+cd ../..
+
+# always install custom builds from dist
+# to make sure that `make dist` doesn't omit any files required to build & test
+if [ -z $DO_CLANG_FORMAT_CHECK ]; then
+    ./autogen.sh
+    ./configure
+    make -j5 dist-gzip
+    V=$(./version.sh)
+    tar -xzf zeromq-$V.tar.gz
+    cd zeromq-$V
+fi
+
 mkdir tmp
 BUILD_PREFIX=$PWD/tmp
 
@@ -35,7 +48,6 @@ elif [ $CURVE == "libsodium" ]; then
 fi
 
 # Build, check, and install from local source
-cd ../..
 mkdir build_cmake
 cd build_cmake
 if [ "$DO_CLANG_FORMAT_CHECK" -eq "1" ] ; then
diff --git a/ci_build.sh b/ci_build.sh
index 095ba3de..dd8060e1 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -70,18 +70,5 @@ if [ $BUILD_TYPE == "default" ]; then
         make VERBOSE=1 -j5 distcheck
     ) || exit 1
 else
-    # always install custom builds from dist
-    # to make sure that `make dist` doesn't omit any files required to build & test
-    # coverage, valgrind are special-case tests that aren't meant to be runnable from releases
-    if [ ${BUILD_TYPE} != "coverage" ] && [ ${BUILD_TYPE} != "valgrind" ]; then
-        ./autogen.sh
-        ./configure
-        make -j5 dist-gzip
-        V=$(./version.sh)
-        tar -xzf zeromq-$V.tar.gz
-        cd zeromq-$V
-    fi
-
-    # start the actual build from inside the dist
     cd ./builds/${BUILD_TYPE} && ./ci_build.sh
 fi