diff --git a/emacs/check.sh b/emacs/check.sh
index 29f601beb..5618d07c9 100755
--- a/emacs/check.sh
+++ b/emacs/check.sh
@@ -8,7 +8,7 @@ NEEDED_PACKAGES="package-lint company iedit auto-complete compat"
 ELS_TO_CHECK=*.el
 # To reduce the amount of false positives we only package-lint files
 # that are actual installable packages.
-PKGS_TO_CHECK="merlin.el merlin-ac.el merlin-company.el merlin-iedit.el merlin-cap.el tests/merlin-cap-test.el"
+PKGS_TO_CHECK="merlin-ac.el merlin-company.el merlin-iedit.el"
 
 INIT_PACKAGE_EL="(progn \
   (require 'package) \
@@ -51,6 +51,17 @@ EMACS_PACKAGE_LINT_IGNORE=1
          -f package-lint-batch-and-exit \
          ${PKGS_TO_CHECK} || [ -n "${EMACS_PACKAGE_LINT_IGNORE:+x}" ]
 
+
+PKGS_TO_CHECK="merlin.el merlin-cap.el"
+
+"$EMACS" -Q -batch \
+         --eval "$INIT_PACKAGE_EL" \
+         -L . \
+         --eval "(require 'package-lint)" \
+         --eval "(setq package-lint-main-file \"merlin.el\")" \
+         -f package-lint-batch-and-exit \
+         ${PKGS_TO_CHECK} || [ -n "${EMACS_PACKAGE_LINT_IGNORE:+x}" ]
+
 # Run tests in batch mode.
 "$EMACS" -Q -batch \
          --eval "$INIT_PACKAGE_EL" \