diff --git a/gcc/testsuite/gm2/link/pimc/pass/testgetopt.mod b/gcc/testsuite/gm2/link/pimc/pass/testgetopt.mod
index f84f7666516..eec533aa6a5 100644
--- a/gcc/testsuite/gm2/link/pimc/pass/testgetopt.mod
+++ b/gcc/testsuite/gm2/link/pimc/pass/testgetopt.mod
@@ -61,7 +61,7 @@ BEGIN
    l := InitString (':a:b:c:d:e:o:s:hx:y:') ;
    s := NIL ;
    arg := NIL ;
-   ch := GetOpt (UnixArgs.ArgC, UnixArgs.ArgV, l,
+   ch := GetOpt (UnixArgs.GetArgC (), UnixArgs.GetArgV (), l,
                  arg, optind, opterr, optopt) ;
    WHILE ch # nul DO
       CASE ch OF
@@ -83,7 +83,7 @@ BEGIN
          exit (1)
       END ;
       arg := KillString (arg) ;
-      ch := GetOpt (UnixArgs.ArgC, UnixArgs.ArgV, l,
+      ch := GetOpt (UnixArgs.GetArgC (), UnixArgs.GetArgV (), l,
                     arg, optind, opterr, optopt)
    END
 END HandleOptions ;
diff --git a/gcc/testsuite/gm2/link/pimc/pass/testunixargs.mod b/gcc/testsuite/gm2/link/pimc/pass/testunixargs.mod
index 8b524f51306..b78663f7bf3 100644
--- a/gcc/testsuite/gm2/link/pimc/pass/testunixargs.mod
+++ b/gcc/testsuite/gm2/link/pimc/pass/testunixargs.mod
@@ -2,7 +2,7 @@ MODULE testunixargs ;
 
 (* A trivial test to test for the existence of UnixArgs and SYSTEM.  *)
 
-FROM UnixArgs IMPORT ArgV, ArgC ;
+FROM UnixArgs IMPORT GetArgV, GetArgC ;
 FROM SYSTEM IMPORT ADDRESS ;
 
 VAR