diff --git a/tests/optargs.test b/tests/optargs.test
index 4e130e7d..15c680c9 100755
--- a/tests/optargs.test
+++ b/tests/optargs.test
@@ -25,8 +25,13 @@ exit $?
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with Mes.  If not, see <http://www.gnu.org/licenses/>.
 
-(mes-use-module (mes optargs))
-(mes-use-module (mes test))
+(cond-expand
+ (guile-2)
+ (guile
+  (use-modules (ice-9 optargs)))
+ (mes
+  (mes-use-module (mes optargs))
+  (mes-use-module (mes test))))
 
 (pass-if-equal "cond =>" 10
   (cond