diff --git a/sim/testsuite/frv/allinsn-a-b.exp b/sim/testsuite/frv/allinsn-a-b.exp
new file mode 100644
index 00000000000..c24cd42fb19
--- /dev/null
+++ b/sim/testsuite/frv/allinsn-a-b.exp
@@ -0,0 +1,17 @@
+# FRV simulator testsuite.
+
+sim_init
+
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[a-b\]*.cgs]] {
+    # If we're only testing specific files and this isn't one of them,
+    # skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
+    }
+    run_sim_test $src $all_machs
+}
diff --git a/sim/testsuite/frv/allinsn-c.exp b/sim/testsuite/frv/allinsn-c.exp
new file mode 100644
index 00000000000..e1672e8f273
--- /dev/null
+++ b/sim/testsuite/frv/allinsn-c.exp
@@ -0,0 +1,17 @@
+# FRV simulator testsuite.
+
+sim_init
+
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[c\]*.cgs]] {
+    # If we're only testing specific files and this isn't one of them,
+    # skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
+    }
+    run_sim_test $src $all_machs
+}
diff --git a/sim/testsuite/frv/allinsn-d-h.exp b/sim/testsuite/frv/allinsn-d-h.exp
new file mode 100644
index 00000000000..8c29369035a
--- /dev/null
+++ b/sim/testsuite/frv/allinsn-d-h.exp
@@ -0,0 +1,17 @@
+# FRV simulator testsuite.
+
+sim_init
+
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[d-h\]*.cgs]] {
+    # If we're only testing specific files and this isn't one of them,
+    # skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
+    }
+    run_sim_test $src $all_machs
+}
diff --git a/sim/testsuite/frv/allinsn-i-l.exp b/sim/testsuite/frv/allinsn-i-l.exp
new file mode 100644
index 00000000000..10b8793ceee
--- /dev/null
+++ b/sim/testsuite/frv/allinsn-i-l.exp
@@ -0,0 +1,17 @@
+# FRV simulator testsuite.
+
+sim_init
+
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[i-l\]*.cgs]] {
+    # If we're only testing specific files and this isn't one of them,
+    # skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
+    }
+    run_sim_test $src $all_machs
+}
diff --git a/sim/testsuite/frv/allinsn-m.exp b/sim/testsuite/frv/allinsn-m.exp
new file mode 100644
index 00000000000..e3733e05550
--- /dev/null
+++ b/sim/testsuite/frv/allinsn-m.exp
@@ -0,0 +1,17 @@
+# FRV simulator testsuite.
+
+sim_init
+
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[m\]*.cgs]] {
+    # If we're only testing specific files and this isn't one of them,
+    # skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
+    }
+    run_sim_test $src $all_machs
+}
diff --git a/sim/testsuite/frv/allinsn-n.exp b/sim/testsuite/frv/allinsn-n.exp
new file mode 100644
index 00000000000..e6c41b414f6
--- /dev/null
+++ b/sim/testsuite/frv/allinsn-n.exp
@@ -0,0 +1,17 @@
+# FRV simulator testsuite.
+
+sim_init
+
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[n\]*.cgs]] {
+    # If we're only testing specific files and this isn't one of them,
+    # skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
+    }
+    run_sim_test $src $all_machs
+}
diff --git a/sim/testsuite/frv/allinsn-o-s.exp b/sim/testsuite/frv/allinsn-o-s.exp
new file mode 100644
index 00000000000..98906e81bc4
--- /dev/null
+++ b/sim/testsuite/frv/allinsn-o-s.exp
@@ -0,0 +1,17 @@
+# FRV simulator testsuite.
+
+sim_init
+
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[o-s\]*.cgs]] {
+    # If we're only testing specific files and this isn't one of them,
+    # skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
+    }
+    run_sim_test $src $all_machs
+}
diff --git a/sim/testsuite/frv/allinsn-t-z.exp b/sim/testsuite/frv/allinsn-t-z.exp
new file mode 100644
index 00000000000..04b0e5709cb
--- /dev/null
+++ b/sim/testsuite/frv/allinsn-t-z.exp
@@ -0,0 +1,17 @@
+# FRV simulator testsuite.
+
+sim_init
+
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[t-z\]*.cgs]] {
+    # If we're only testing specific files and this isn't one of them,
+    # skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
+    }
+    run_sim_test $src $all_machs
+}
diff --git a/sim/testsuite/frv/allinsn.exp b/sim/testsuite/frv/allinsn.exp
deleted file mode 100644
index 32a87a3a354..00000000000
--- a/sim/testsuite/frv/allinsn.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# FRV simulator testsuite.
-
-sim_init
-
-if [istarget *] {
-    # all machines
-    set all_machs "frv fr500 fr550 fr400 fr405 fr450"
-    set cpu_option -mcpu
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
-    }
-}