diff --git a/test/test-helper.el b/test/test-helper.el
index 3866003..cb0a2ad 100644
--- a/test/test-helper.el
+++ b/test/test-helper.el
@@ -55,4 +55,56 @@ attention to case differences."
   (let ((case-fold-search ignore-case))
     (string-match-p (regexp-quote needle) s)))
 
+(defmacro when-refactoring-it (description before after &rest body)
+  "Return a buttercup spec.
+
+Insert BEFORE into a buffer, evaluate BODY and compare the resulting buffer to
+AFTER.
+
+BODY should contain the refactoring that transforms BEFORE into AFTER.
+
+DESCRIPTION is the description of the spec."
+  (declare (indent 1))
+  `(it ,description
+     (with-clojure-ts-buffer ,before
+       ,@body
+       (expect (buffer-string) :to-equal ,after))))
+
+(defmacro when-refactoring-with-point-it (description before after &rest body)
+  "Return a buttercup spec.
+
+Like when-refactor-it but also checks whether point is moved to the expected
+position.
+
+BEFORE is the buffer string before refactoring, where a pipe (|) represents
+point.
+
+AFTER is the expected buffer string after refactoring, where a pipe (|)
+represents the expected position of point.
+
+DESCRIPTION is a string with the description of the spec."
+  (declare (indent 1))
+  `(it ,description
+     (let* ((after ,after)
+            (expected-cursor-pos (1+ (clojure-ts--s-index-of "|" after)))
+            (expected-state (delete ?| after)))
+       (with-clojure-ts-buffer ,before
+         (goto-char (point-min))
+         (search-forward "|")
+         (delete-char -1)
+         ,@body
+         (expect (buffer-string) :to-equal expected-state)
+         (expect (point) :to-equal expected-cursor-pos)))))
+
+
+;; https://emacs.stackexchange.com/a/55031
+(defmacro with-temp-dir (temp-dir &rest body)
+  "Create a temporary directory and bind its to TEMP-DIR while evaluating BODY.
+Removes the temp directory at the end of evaluation."
+  `(let ((,temp-dir (make-temp-file "" t)))
+    (unwind-protect
+      (progn
+        ,@body)
+      (delete-directory ,temp-dir t))))
+
 ;;; test-helper.el ends here
diff --git a/utils/test-helper.el b/utils/test-helper.el
deleted file mode 100644
index af5273a..0000000
--- a/utils/test-helper.el
+++ /dev/null
@@ -1,103 +0,0 @@
-;;; test-helper.el --- Clojure Mode: Non-interactive unit-test setup  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2014-2021 Bozhidar Batsov <bozhidar@batsov.dev>
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Non-interactive test suite setup.
-
-;;; Code:
-
-(message "Running tests on Emacs %s" emacs-version)
-
-(defmacro with-clojure-buffer (text &rest body)
-  "Create a temporary buffer, insert TEXT, switch to clojure-mode and evaluate BODY."
-  (declare (indent 1))
-  `(with-temp-buffer
-     (erase-buffer)
-     (insert ,text)
-     (clojure-mode)
-     ,@body))
-
-(defmacro with-clojure-buffer-point (text &rest body)
-  "Run BODY in a temporary clojure buffer with TEXT.
-
-TEXT is a string with a | indicating where point is.  The | will be erased
-and point left there."
-  (declare (indent 2))
-  `(progn
-     (with-clojure-buffer ,text
-       (goto-char (point-min))
-       (re-search-forward "|")
-       (delete-char -1)
-       ,@body)))
-
-(defmacro when-refactoring-it (description before after &rest body)
-  "Return a buttercup spec.
-
-Insert BEFORE into a buffer, evaluate BODY and compare the resulting buffer to
-AFTER.
-
-BODY should contain the refactoring that transforms BEFORE into AFTER.
-
-DESCRIPTION is the description of the spec."
-  (declare (indent 1))
-  `(it ,description
-     (with-clojure-buffer ,before
-       ,@body
-       (expect (buffer-string) :to-equal ,after))))
-
-(defmacro when-refactoring-with-point-it (description before after &rest body)
-  "Return a buttercup spec.
-
-Like when-refactor-it but also checks whether point is moved to the expected
-position.
-
-BEFORE is the buffer string before refactoring, where a pipe (|) represents
-point.
-
-AFTER is the expected buffer string after refactoring, where a pipe (|)
-represents the expected position of point.
-
-DESCRIPTION is a string with the description of the spec."
-  (declare (indent 1))
-  `(it ,description
-     (let* ((after ,after)
-            (expected-cursor-pos (1+ (s-index-of "|" after)))
-            (expected-state (delete ?| after)))
-       (with-clojure-buffer ,before
-         (goto-char (point-min))
-         (search-forward "|")
-         (delete-char -1)
-         ,@body
-         (expect (buffer-string) :to-equal expected-state)
-         (expect (point) :to-equal expected-cursor-pos)))))
-
-
-;; https://emacs.stackexchange.com/a/55031
-(defmacro with-temp-dir (temp-dir &rest body)
-  "Create a temporary directory and bind its to TEMP-DIR while evaluating BODY.
-Removes the temp directory at the end of evaluation."
-  `(let ((,temp-dir (make-temp-file "" t)))
-    (unwind-protect
-      (progn
-        ,@body)
-      (delete-directory ,temp-dir t))))
-
-(provide 'test-helper)
-;;; test-helper.el ends here