diff --git a/testsuite/libffi.bhaible/bhaible.exp b/testsuite/libffi.bhaible/bhaible.exp
index 3522bd4..44aebc5 100644
--- a/testsuite/libffi.bhaible/bhaible.exp
+++ b/testsuite/libffi.bhaible/bhaible.exp
@@ -47,7 +47,13 @@ for {set i 1} {$i < 82} {incr i} {
 set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/test-callback.c]]
 
 for {set i 1} {$i < 81} {incr i} {
-    run-many-tests $tlist [format "-DDGTEST=%d %s" $i $warning_options]
+    if { [libffi_feature_test "#if FFI_CLOSURES"] } {
+        run-many-tests $tlist [format "-DDGTEST=%d %s" $i $warning_options]
+    } else {
+        foreach test $tlist {
+            unsupported [format "%s -DDGTEST=%d %s" $test $i $warning_options]
+        }
+    }
 }
 
 dg-finish
diff --git a/testsuite/libffi.closures/closure.exp b/testsuite/libffi.closures/closure.exp
index eafbef0..9bbc807 100644
--- a/testsuite/libffi.closures/closure.exp
+++ b/testsuite/libffi.closures/closure.exp
@@ -43,6 +43,22 @@ if { [libffi_feature_test "#if FFI_CLOSURES"] } {
     }
 }
 
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.cc]]
+
+# No C++ for or1k
+if { [istarget "or1k-*-*"] } {
+    foreach test $tlist {
+        unsupported "$test"
+    }
+} else {
+    if { [libffi_feature_test "#if FFI_CLOSURES"] } {
+        run-many-tests $tlist  $additional_options
+    } else {
+        foreach test $tlist {
+	    unsupported "$test"
+    }
+}
+
 dg-finish
 
 # Local Variables:
diff --git a/testsuite/libffi.call/err_bad_abi.c b/testsuite/libffi.closures/err_bad_abi.c
similarity index 100%
rename from testsuite/libffi.call/err_bad_abi.c
rename to testsuite/libffi.closures/err_bad_abi.c
diff --git a/testsuite/libffi.call/huge_struct.c b/testsuite/libffi.closures/huge_struct.c
similarity index 100%
rename from testsuite/libffi.call/huge_struct.c
rename to testsuite/libffi.closures/huge_struct.c
diff --git a/testsuite/libffi.call/nested_struct.c b/testsuite/libffi.closures/nested_struct.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct.c
rename to testsuite/libffi.closures/nested_struct.c
diff --git a/testsuite/libffi.call/nested_struct1.c b/testsuite/libffi.closures/nested_struct1.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct1.c
rename to testsuite/libffi.closures/nested_struct1.c
diff --git a/testsuite/libffi.call/nested_struct10.c b/testsuite/libffi.closures/nested_struct10.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct10.c
rename to testsuite/libffi.closures/nested_struct10.c
diff --git a/testsuite/libffi.call/nested_struct11.c b/testsuite/libffi.closures/nested_struct11.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct11.c
rename to testsuite/libffi.closures/nested_struct11.c
diff --git a/testsuite/libffi.call/nested_struct2.c b/testsuite/libffi.closures/nested_struct2.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct2.c
rename to testsuite/libffi.closures/nested_struct2.c
diff --git a/testsuite/libffi.call/nested_struct4.c b/testsuite/libffi.closures/nested_struct4.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct4.c
rename to testsuite/libffi.closures/nested_struct4.c
diff --git a/testsuite/libffi.call/nested_struct5.c b/testsuite/libffi.closures/nested_struct5.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct5.c
rename to testsuite/libffi.closures/nested_struct5.c
diff --git a/testsuite/libffi.call/nested_struct6.c b/testsuite/libffi.closures/nested_struct6.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct6.c
rename to testsuite/libffi.closures/nested_struct6.c
diff --git a/testsuite/libffi.call/nested_struct7.c b/testsuite/libffi.closures/nested_struct7.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct7.c
rename to testsuite/libffi.closures/nested_struct7.c
diff --git a/testsuite/libffi.call/nested_struct8.c b/testsuite/libffi.closures/nested_struct8.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct8.c
rename to testsuite/libffi.closures/nested_struct8.c
diff --git a/testsuite/libffi.call/nested_struct9.c b/testsuite/libffi.closures/nested_struct9.c
similarity index 100%
rename from testsuite/libffi.call/nested_struct9.c
rename to testsuite/libffi.closures/nested_struct9.c
diff --git a/testsuite/libffi.call/problem1.c b/testsuite/libffi.closures/problem1.c
similarity index 100%
rename from testsuite/libffi.call/problem1.c
rename to testsuite/libffi.closures/problem1.c
diff --git a/testsuite/libffi.call/stret_large.c b/testsuite/libffi.closures/stret_large.c
similarity index 100%
rename from testsuite/libffi.call/stret_large.c
rename to testsuite/libffi.closures/stret_large.c
diff --git a/testsuite/libffi.call/stret_large2.c b/testsuite/libffi.closures/stret_large2.c
similarity index 100%
rename from testsuite/libffi.call/stret_large2.c
rename to testsuite/libffi.closures/stret_large2.c
diff --git a/testsuite/libffi.call/stret_medium.c b/testsuite/libffi.closures/stret_medium.c
similarity index 100%
rename from testsuite/libffi.call/stret_medium.c
rename to testsuite/libffi.closures/stret_medium.c
diff --git a/testsuite/libffi.call/stret_medium2.c b/testsuite/libffi.closures/stret_medium2.c
similarity index 100%
rename from testsuite/libffi.call/stret_medium2.c
rename to testsuite/libffi.closures/stret_medium2.c
diff --git a/testsuite/libffi.call/testclosure.c b/testsuite/libffi.closures/testclosure.c
similarity index 100%
rename from testsuite/libffi.call/testclosure.c
rename to testsuite/libffi.closures/testclosure.c
diff --git a/testsuite/libffi.call/unwindtest.cc b/testsuite/libffi.closures/unwindtest.cc
similarity index 100%
rename from testsuite/libffi.call/unwindtest.cc
rename to testsuite/libffi.closures/unwindtest.cc