diff --git a/hlint.sh b/hlint.sh
index c6772fda7..5f30751cc 100755
--- a/hlint.sh
+++ b/hlint.sh
@@ -4,4 +4,15 @@ set -e
 
 [ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
 
+move-back() {
+    mv -v .stack-work .stack-work-test
+    [[ -d .stack-work-build ]] && mv -v .stack-work-build .stack-work
+}
+
+if [[ -d .stack-work-test ]]; then
+    [[ -d .stack-work ]] && mv -v .stack-work .stack-work-build
+    mv -v .stack-work-test .stack-work
+    trap move-back EXIT
+fi
+
 exec -- stack build --test --fast --flag uniworx:dev --flag uniworx:library-only uniworx:test:hlint