diff --git a/rust/ql/test/library-tests/type-inference/main.rs b/rust/ql/test/library-tests/type-inference/main.rs
index 8dcff4ede6fc..81b9e5eb4b1a 100644
--- a/rust/ql/test/library-tests/type-inference/main.rs
+++ b/rust/ql/test/library-tests/type-inference/main.rs
@@ -2285,3 +2285,26 @@ fn main() {
     tuples::f(); // $ method=f
     dereference::test(); // $ method=test
 }
+
+pub mod unwrap {
+    pub fn test_unwrapping() -> Option<()> {
+        let value = Some(42);
+        if let Some(mesg) = value {
+            let mesg = mesg; // $ MISSING: type=mesg:i32
+            println!("{mesg}");
+        }
+        match value {
+            Some(mesg) => {
+                let mesg = mesg; // $ MISSING: type=mesg:i32
+                println!("{mesg}");
+            }
+            None => (),
+        };
+        let mesg = value.unwrap(); // $ method=unwrap
+        let mesg = mesg; // $ type=mesg:i32
+        println!("{mesg}");
+        let mesg = value?; // $ type=mesg:i32
+        println!("{mesg}");
+        None
+    }
+}
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
index 6d603dccf2ce..82b2668b5131 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -3644,4 +3644,35 @@ inferType
 | main.rs:2262:20:2262:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
 | main.rs:2262:41:2262:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
 | main.rs:2278:5:2278:15 | ...::f(...) |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2290:44:2309:5 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2291:13:2291:17 | value |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2291:13:2291:17 | value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2291:21:2291:28 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2291:21:2291:28 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2291:26:2291:27 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2292:29:2292:33 | value |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2292:29:2292:33 | value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2294:22:2294:29 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2294:22:2294:29 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2296:15:2296:19 | value |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2296:15:2296:19 | value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2299:26:2299:33 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2299:26:2299:33 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2303:13:2303:16 | mesg |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2303:20:2303:24 | value |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2303:20:2303:24 | value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2303:20:2303:33 | value.unwrap() |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2304:13:2304:16 | mesg |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2304:20:2304:23 | mesg |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2305:18:2305:25 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2305:18:2305:25 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2305:20:2305:23 | mesg |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2306:13:2306:16 | mesg |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2306:20:2306:24 | value |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2306:20:2306:24 | value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2306:20:2306:25 | TryExpr |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2307:18:2307:25 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2307:18:2307:25 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2307:20:2307:23 | mesg |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2308:9:2308:12 | None |  | {EXTERNAL LOCATION} | Option |
 testFailures