diff --git a/Makefile.am b/Makefile.am
index 7667f228672cf1d86875d5846cec5cc8159dfba8..e07362fd56b2d9eaf329461c26d06270d1ef1342 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,4 +17,5 @@ EXTRA_DIST = \
 	README.md \
 	CHANGES.md \
 	t/edugain.xml \
+	t/lib.pm \
 	$(TESTS)
diff --git a/t/cli.t b/t/cli.t
index d016df007b3587b7a617530b8d1eb146fe933393..63f808ec1a832f21e16f026369c9cfcc19aa5700 100755
--- a/t/cli.t
+++ b/t/cli.t
@@ -214,7 +214,7 @@ sub run_executable {
 
     my @args = $args ? split(/\s+/, $args) : ();
     run(
-        [ $EXECUTABLE_NAME, '-I', 'lib', 'bin/' . $executable, @args ],
+        [ $EXECUTABLE_NAME, '-I', 'lib', '-I', 't', 'bin/' . $executable, @args ],
         \my ($in, $out, $err)
     );
     return ($out, $err, $CHILD_ERROR >> 8);
diff --git a/t/lib.pm b/t/lib.pm
new file mode 100644
index 0000000000000000000000000000000000000000..1c71697e560b3b8b7a1dbf79555dab5d7f3b8314
--- /dev/null
+++ b/t/lib.pm
@@ -0,0 +1,10 @@
+package lib;
+
+# this module overrides the system one, in order to ensure precedence of local
+# module version specificed on command-line over those already installed
+
+sub import {
+    # do nothing
+};
+
+1;