diff --git a/tests/dune_hello/dune b/tests/dune_hello/dune
index 9c5f8d0da84..86f94bf3049 100644
--- a/tests/dune_hello/dune
+++ b/tests/dune_hello/dune
@@ -4,8 +4,3 @@
  (libraries fstar.lib)
  (modes native)
 )
-(env
-  (_
-    (bin_annot false)
-    (flags (:standard -w -A)))
-)
diff --git a/tests/semiring/Makefile b/tests/semiring/Makefile
index 7e6b0f392fb..a67094ab53e 100644
--- a/tests/semiring/Makefile
+++ b/tests/semiring/Makefile
@@ -23,7 +23,7 @@ $(OUTPUT_DIR)/%.ml:
 
 %.cmxs: %.ml
 	$(call msg, "OCAMLOPT", $<)
-	$(OCAMLOPT) -w -8 -shared -package fstar.lib -o $@ $*.ml
+	$(FSTAR_EXE) --ocamlc_plugin -o $@ $*.ml
 
 # REMARK: --load will compile $*.ml if $*.cmxs does not exist, but we
 # compile it before and use --load_cmxs
diff --git a/tests/simple_hello/Makefile b/tests/simple_hello/Makefile
index d4cbb66c1b3..384b2942d0d 100644
--- a/tests/simple_hello/Makefile
+++ b/tests/simple_hello/Makefile
@@ -13,4 +13,4 @@ Hello.test: Hello.exe
 	$(FSTAR) --codegen OCaml $< --extract $*
 
 %.exe: %.ml
-	$(FSTAR) --ocamlenv ocamlfind ocamlopt -package fstar.lib -linkpkg $< -o $@
+	$(FSTAR) --ocamlc $< -o $@