diff --git a/clojure-mode.el b/clojure-mode.el
index f9479173..9cdcb1dc 100644
--- a/clojure-mode.el
+++ b/clojure-mode.el
@@ -68,7 +68,6 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
   (defvar calculate-lisp-indent-last-sexp)
   (defvar font-lock-beg)
   (defvar font-lock-end)
@@ -79,12 +78,12 @@
   (defvar slime-from-lisp-filename-function)
   (defvar slime-to-lisp-filename-function))
 
+(require 'cl)
 (require 'tramp)
 (require 'inf-lisp)
 (require 'imenu)
 
 (declare-function clojure-test-jump-to-implementation  "clojure-test-mode.el")
-(declare-function subseq                               "cl-extra.el")
 (declare-function slime-connect                        "slime.el")
 (declare-function slime-current-connection             "slime.el")
 (declare-function slime-disconnect                     "slime.el")
diff --git a/clojure-test-mode.el b/clojure-test-mode.el
index 8b5c2da5..1249a9d3 100644
--- a/clojure-test-mode.el
+++ b/clojure-test-mode.el
@@ -120,9 +120,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
+(require 'cl)
 (require 'clojure-mode)
 (require 'which-func)
 (require 'nrepl nil t)
@@ -135,8 +133,6 @@
 (declare-function slime-eval-async             "slime.el")
 (declare-function slime-connection-name        "slime.el")
 (declare-function slime-connected-p            "slime.el")
-(declare-function coerce                       "cl-extra.el")
-(declare-function find-if                      "cl-seq.el")
 
 ;; Faces