diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt
new file mode 100644
index 0000000000..f5f8c2a5bb
--- /dev/null
+++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt
@@ -0,0 +1,7 @@
+#lang typed/scheme #:optimize
+
+(require racket/unsafe/ops)
+
+(let ((t1 (+ 1.0+2.0i 2.0+4.0i))
+      (t2 (+ 3.0+6.0i 4.0+8.0i)))
+  (+ t1 t2))
diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/unboxed-let2.rkt
new file mode 100644
index 0000000000..9562161ebe
--- /dev/null
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/unboxed-let2.rkt
@@ -0,0 +1,23 @@
+#lang typed/scheme #:optimize
+
+(require racket/unsafe/ops)
+
+(let* ((unboxed-gensym-1 1.0+2.0i)
+       (unboxed-gensym-2 (unsafe-flreal-part unboxed-gensym-1))
+       (unboxed-gensym-3 (unsafe-flimag-part unboxed-gensym-1))
+       (unboxed-gensym-4 2.0+4.0i)
+       (unboxed-gensym-5 (unsafe-flreal-part unboxed-gensym-4))
+       (unboxed-gensym-6 (unsafe-flimag-part unboxed-gensym-4))
+       (unboxed-gensym-7 (unsafe-fl+ unboxed-gensym-2 unboxed-gensym-5))
+       (unboxed-gensym-8 (unsafe-fl+ unboxed-gensym-3 unboxed-gensym-6))
+       (unboxed-gensym-9 3.0+6.0i)
+       (unboxed-gensym-10 (unsafe-flreal-part unboxed-gensym-9))
+       (unboxed-gensym-11 (unsafe-flimag-part unboxed-gensym-9))
+       (unboxed-gensym-12 4.0+8.0i)
+       (unboxed-gensym-13 (unsafe-flreal-part unboxed-gensym-12))
+       (unboxed-gensym-14 (unsafe-flimag-part unboxed-gensym-12))
+       (unboxed-gensym-15 (unsafe-fl+ unboxed-gensym-10 unboxed-gensym-13))
+       (unboxed-gensym-16 (unsafe-fl+ unboxed-gensym-11 unboxed-gensym-14))
+       (unboxed-gensym-17 (unsafe-fl+ unboxed-gensym-7 unboxed-gensym-15))
+       (unboxed-gensym-18 (unsafe-fl+ unboxed-gensym-8 unboxed-gensym-16)))
+  (unsafe-make-flrectangular unboxed-gensym-17 unboxed-gensym-18))
diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let2.rkt
new file mode 100644
index 0000000000..c376151f47
--- /dev/null
+++ b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let2.rkt
@@ -0,0 +1,7 @@
+#lang typed/scheme
+
+(require racket/unsafe/ops)
+
+(let ((t1 (+ 1.0+2.0i 2.0+4.0i))
+      (t2 (+ 3.0+6.0i 4.0+8.0i)))
+  (+ t1 t2))