diff --git a/llvm/bindings/ocaml/transforms/tapir_opts/llvm_tapir_opts.ml b/llvm/bindings/ocaml/transforms/tapir_opts/llvm_tapir_opts.ml
index 1bc169227fbf..1a12243265a7 100644
--- a/llvm/bindings/ocaml/transforms/tapir_opts/llvm_tapir_opts.ml
+++ b/llvm/bindings/ocaml/transforms/tapir_opts/llvm_tapir_opts.ml
@@ -7,10 +7,9 @@
  *
  *===----------------------------------------------------------------------===*)
 
-type tapir_target
-
-(** Tapir pass to install Cilky stuff in place of detach/sync instructions. *)
-external add_lower_tapir_to_cilk :
+(** Tapir pass to install Cilky (or other target-specific) stuff in place of
+    detach/sync instructions. *)
+external add_lower_tapir_to_target :
   [ `Module ] Llvm.PassManager.t -> unit
   = "llvm_add_lower_tapir_to_target"
 
diff --git a/llvm/bindings/ocaml/transforms/tapir_opts/llvm_tapir_opts.mli b/llvm/bindings/ocaml/transforms/tapir_opts/llvm_tapir_opts.mli
index 1bc169227fbf..1a12243265a7 100644
--- a/llvm/bindings/ocaml/transforms/tapir_opts/llvm_tapir_opts.mli
+++ b/llvm/bindings/ocaml/transforms/tapir_opts/llvm_tapir_opts.mli
@@ -7,10 +7,9 @@
  *
  *===----------------------------------------------------------------------===*)
 
-type tapir_target
-
-(** Tapir pass to install Cilky stuff in place of detach/sync instructions. *)
-external add_lower_tapir_to_cilk :
+(** Tapir pass to install Cilky (or other target-specific) stuff in place of
+    detach/sync instructions. *)
+external add_lower_tapir_to_target :
   [ `Module ] Llvm.PassManager.t -> unit
   = "llvm_add_lower_tapir_to_target"
 
diff --git a/llvm/test/Bindings/OCaml/scalar_opts.ml b/llvm/test/Bindings/OCaml/scalar_opts.ml
index b130fe125461..c07c51384904 100644
--- a/llvm/test/Bindings/OCaml/scalar_opts.ml
+++ b/llvm/test/Bindings/OCaml/scalar_opts.ml
@@ -8,10 +8,12 @@
 
 (* Note: It takes several seconds for ocamlopt to link an executable with
          libLLVMCore.a, so it's better to write a big test than a bunch of
-         little ones. *)
+         little ones. For the same reason, the Tapir tests are added here
+         instead of in their own test suite. *)
 
 open Llvm
 open Llvm_scalar_opts
+open Llvm_tapir_opts
 open Llvm_target
 
 let context = global_context ()
@@ -78,6 +80,8 @@ let test_transforms () =
            ++ add_type_based_alias_analysis
            ++ add_scoped_no_alias_alias_analysis
            ++ add_basic_alias_analysis
+           ++ add_loop_spawning
+           ++ add_lower_tapir_to_target
            ++ PassManager.initialize
            ++ PassManager.run_function fn
            ++ PassManager.finalize