diff --git a/test/ChangeLog b/test/ChangeLog
index e48862a104c..d050a19c19a 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-08  Chong Yidong  <cyd@stupidchicken.com>
+
+	* automated/font-parse-tests.el: Don't byte-compile.
+
+	* automated/comint-testsuite.el: Move from test/.  Convert to ERT.
+
 2011-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* automated/lexbind-tests.el: New file.
diff --git a/test/automated/comint-testsuite.el b/test/automated/comint-testsuite.el
new file mode 100644
index 00000000000..4b2d3896407
--- /dev/null
+++ b/test/automated/comint-testsuite.el
@@ -0,0 +1,52 @@
+;;; comint-testsuite.el
+
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Tests for comint and related modes.
+
+;;; Code:
+
+(require 'comint)
+(require 'ert)
+
+(defvar comint-testsuite-password-strings
+  '("foo@example.net's password: " ;ssh
+    "Password for foo@example.org: " ; kinit
+    "Please enter the password for foo@example.org: "   ; kinit
+    "Kerberos password for devnull/root <at> GNU.ORG: " ; ksu
+    "Enter passphrase: " ; ssh-add
+    "Enter passphrase (empty for no passphrase): " ; ssh-keygen
+    "Enter same passphrase again: "     ; ssh-keygen
+    "Passphrase for key root@GNU.ORG: " ; plink
+    "[sudo] password for user:" ; Ubuntu sudo
+    "Password (again):"
+    "Enter password:")
+  "List of strings that should match `comint-password-prompt-regexp'.")
+
+(ert-deftest comint-test-password-regexp ()
+  "Test `comint-password-prompt-regexp' against common password strings."
+  (dolist (str comint-testsuite-password-strings)
+    (should (string-match comint-password-prompt-regexp str))))
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; comint-testsuite.el ends here
diff --git a/test/automated/font-parse-tests.el b/test/automated/font-parse-tests.el
index 463d0f98bb3..5ba8ad2be32 100644
--- a/test/automated/font-parse-tests.el
+++ b/test/automated/font-parse-tests.el
@@ -158,4 +158,8 @@ expected font properties from parsing NAME.")
 	(insert "\n"))))
   (goto-char (point-min)))
 
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
 ;;; font-parse-tests.el ends here.
diff --git a/test/comint-testsuite.el b/test/comint-testsuite.el
deleted file mode 100644
index 262ac284790..00000000000
--- a/test/comint-testsuite.el
+++ /dev/null
@@ -1,60 +0,0 @@
-;;; bytecomp-testsuite.el
-
-;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs 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.
-
-;; GNU Emacs 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Tests for comint and related modes.
-
-;;; Code:
-
-(require 'comint)
-
-(defun comint-testsuite-run ()
-  (interactive)
-  (with-output-to-temp-buffer "*comint test*"
-    (comint-testsuite--test-comint-password-prompt-regexp)))
-
-(defun comint-testsuite--test-comint-password-prompt-regexp ()
-  (interactive)
-  (let ((password-strings
-	 '("foo@example.net's password: " ;ssh
-	   "Password for foo@example.org: " ; kinit
-	   "Please enter the password for foo@example.org: "   ; kinit
-	   "Kerberos password for devnull/root <at> GNU.ORG: " ; ksu
-	   "Enter passphrase: " ; ssh-add
-	   "Enter passphrase (empty for no passphrase): " ; ssh-keygen
-	   "Enter same passphrase again: "     ; ssh-keygen
-	   "Passphrase for key root@GNU.ORG: " ; plink
-	   "[sudo] password for user:" ; Ubuntu sudo
-	   "Password (again):"
-	   "Enter password:"))
-	fail)
-    (dolist (str password-strings)
-      (unless (string-match comint-password-prompt-regexp str)
-	(setq fail t)
-	(princ (format " ERROR: comint-password-prompt-regexp did not match %s\n"
-		       str))))
-    (if fail
-	(princ "FAILED: comint-password-prompt-regexp test\n")
-      (princ "PASSED: comint-password-prompt-regexp test\n"))))
-
-(provide 'comint-testsuite)
-
-;;; comint-testsuite.el ends here
-