diff --git a/test/Test_MakeTerm.re b/test/Test_MakeTerm.re
new file mode 100644
index 0000000000..82eee683b6
--- /dev/null
+++ b/test/Test_MakeTerm.re
@@ -0,0 +1,70 @@
+/**
+ * This file contains tests to validate the `MakeTerm` module's ability to convert
+ * zippers into expressions.
+ */
+open Alcotest;
+open Haz3lcore;
+
+let exp_typ = testable(Fmt.using(Exp.show, Fmt.string), Exp.fast_equal);
+
+// TODO Assertion if it doesn't parse
+let parse_exp = (s: string) =>
+  MakeTerm.from_zip_for_sem(Option.get(Printer.zipper_of_string(s))).term;
+let exp_check = (expected, actual) =>
+  check(exp_typ, actual, expected, parse_exp(actual));
+
+let tests = [
+  test_case("Integer Literal", `Quick, () => {
+    exp_check(Int(0) |> Exp.fresh, "0")
+  }),
+  test_case("Empty Hole", `Quick, () => {
+    exp_check(EmptyHole |> Exp.fresh, "?")
+  }),
+  test_case("Free Variable", `Quick, () => {
+    exp_check(Var("x") |> Exp.fresh, "x")
+  }),
+  test_case("Parenthesized Expression", `Quick, () => {
+    exp_check(Parens(Int(0) |> Exp.fresh) |> Exp.fresh, "(0)")
+  }),
+  test_case("Let Expression", `Quick, () => {
+    exp_check(
+      Let(
+        Var("x") |> Pat.fresh,
+        Int(1) |> Exp.fresh,
+        Var("x") |> Exp.fresh,
+      )
+      |> Exp.fresh,
+      "let x = 1 in x",
+    )
+  }),
+  test_case("Function Application", `Quick, () => {
+    exp_check(
+      Ap(Forward, Var("f") |> Exp.fresh, Var("x") |> Exp.fresh) |> Exp.fresh,
+      "f(x)",
+    )
+  }),
+  test_case("Named Function Definition", `Quick, () => {
+    exp_check(
+      Let(
+        Var("f") |> Pat.fresh,
+        Fun(Var("x") |> Pat.fresh, Var("x") |> Exp.fresh, None, None)  // It seems as though the function naming happens during elaboration and not during parsing
+        |> Exp.fresh,
+        Int(1) |> Exp.fresh,
+      )
+      |> Exp.fresh,
+      "let f = fun x -> x in 1",
+    )
+  }),
+  test_case("Incomplete Function Definition", `Quick, () => {
+    exp_check(
+      Let(
+        EmptyHole |> Pat.fresh,
+        Fun(Var("x") |> Pat.fresh, EmptyHole |> Exp.fresh, None, None)
+        |> Exp.fresh,
+        EmptyHole |> Exp.fresh,
+      )
+      |> Exp.fresh,
+      "let    = fun x ->   in  ",
+    )
+  }),
+];
diff --git a/test/haz3ltest.re b/test/haz3ltest.re
index 3e13ae44b7..3c6cbb6098 100644
--- a/test/haz3ltest.re
+++ b/test/haz3ltest.re
@@ -8,6 +8,7 @@ let (suite, _) =
       ("Elaboration", Test_Elaboration.elaboration_tests),
       ("Statics", Test_Statics.tests),
       ("Evaluator", Test_Evaluator.tests),
+      ("MakeTerm", Test_MakeTerm.tests),
     ],
   );
 Junit.to_file(Junit.make([suite]), "junit_tests.xml");