diff --git a/debian/changelog b/debian/changelog
index ff64576..dacef5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium
       thanks Jean-Michel Nirgal Vourgère for the bug report and patch!)
     + Testsuite: Let modules.sh ignore the .git directory. (t/modules.t
       failed if a git commit message had a line starting with "use ".)
+    + Testsuite: Optimize modules.sh.
     + Drop all occurrences of apt's --force-yes parameter. It only forces
       the installation of untrusted packages and that's unwanted. (Closes:
       #776487)
diff --git a/t/modules.sh b/t/modules.sh
index 2da1ca1..b98d094 100755
--- a/t/modules.sh
+++ b/t/modules.sh
@@ -25,7 +25,7 @@ use Test::More qw( no_plan );
 EOF
 
 
-for i in `grep '^use ' -r .. | egrep -v '^\./\.git/' | grep -v Expect | grep -v POSIX | grep -v Xen:: | awk '{print $2}' | tr -d 
\;\(\) | sort | uniq`; \
+for i in `grep '^use ' -r .. | egrep -v '^\./\.git/|Expect|POSIX|Xen::' | awk '{print $2}' | tr -d '\r;()' | sort -u`; \
     do \
      echo "BEGIN{ use_ok( '$i' ); }"; \
      echo "require_ok( '$i' );" ; \