diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b5465c05..37d8c233 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: test
-        args: --all ${{matrix.flags}}
+        args: ${{matrix.flags}}
   # no-std builds are a bit more extensive to test
   no_std_build:
     name: NoStdBuild
diff --git a/Cargo.toml b/Cargo.toml
index 9d989830..37f7f626 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,9 @@
+[workspace]
+members = [
+  ".",
+  "codegen"
+]
+
 [package]
 name = "rhai"
 version = "0.18.3"
diff --git a/codegen/ui_tests/rhai_fn_non_clonable_return.rs b/codegen/ui_tests/rhai_fn_non_clonable_return.rs
new file mode 100644
index 00000000..e2e2d788
--- /dev/null
+++ b/codegen/ui_tests/rhai_fn_non_clonable_return.rs
@@ -0,0 +1,27 @@
+use rhai::plugin::*;
+
+struct NonClonable {
+    a: f32,
+    b: u32,
+    c: char,
+    d: bool,
+}
+
+#[export_fn]
+pub fn test_fn(input: f32) -> NonClonable {
+    NonClonable {
+        a: input,
+        b: 10,
+        c: 'a',
+        d: true,
+    }
+}
+
+fn main() {
+    let n = test_fn(20.0);
+    if n.c == 'a' {
+        println!("yes");
+    } else {
+        println!("no");
+    }
+}
diff --git a/codegen/ui_tests/rhai_fn_non_clonable_return.stderr b/codegen/ui_tests/rhai_fn_non_clonable_return.stderr
new file mode 100644
index 00000000..ebe6c264
--- /dev/null
+++ b/codegen/ui_tests/rhai_fn_non_clonable_return.stderr
@@ -0,0 +1,10 @@
+error[E0277]: the trait bound `NonClonable: Clone` is not satisfied
+   --> $DIR/rhai_fn_non_clonable_return.rs:11:8
+    |
+11  | pub fn test_fn(input: f32) -> NonClonable {
+    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `NonClonable`
+    |
+   ::: $WORKSPACE/src/any.rs
+    |
+    |     pub fn from<T: Variant + Clone>(value: T) -> Self {
+    |                              ----- required by this bound in `rhai::Dynamic::from`
diff --git a/codegen/ui_tests/rhai_mod_non_clonable_return.rs b/codegen/ui_tests/rhai_mod_non_clonable_return.rs
new file mode 100644
index 00000000..fe8f5fff
--- /dev/null
+++ b/codegen/ui_tests/rhai_mod_non_clonable_return.rs
@@ -0,0 +1,29 @@
+use rhai::plugin::*;
+
+struct NonClonable {
+    a: f32,
+    b: u32,
+    c: char,
+    d: bool,
+}
+
+#[export_module]
+pub mod test_mod {
+    pub fn test_fn(input: f32) -> NonClonable {
+        NonClonable {
+            a: input,
+            b: 10,
+            c: 'a',
+            d: true,
+        }
+    }
+}
+
+fn main() {
+    let n = test_mod::test_fn(20.0);
+    if n.c == 'a' {
+        println!("yes");
+    } else {
+        println!("no");
+    }
+}
diff --git a/codegen/ui_tests/rhai_mod_non_clonable_return.stderr b/codegen/ui_tests/rhai_mod_non_clonable_return.stderr
new file mode 100644
index 00000000..99a42bb3
--- /dev/null
+++ b/codegen/ui_tests/rhai_mod_non_clonable_return.stderr
@@ -0,0 +1,10 @@
+error[E0277]: the trait bound `NonClonable: Clone` is not satisfied
+   --> $DIR/rhai_mod_non_clonable_return.rs:12:12
+    |
+12  |     pub fn test_fn(input: f32) -> NonClonable {
+    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `NonClonable`
+    |
+   ::: $WORKSPACE/src/any.rs
+    |
+    |     pub fn from<T: Variant + Clone>(value: T) -> Self {
+    |                              ----- required by this bound in `rhai::Dynamic::from`
diff --git a/no_std/no_std_test/Cargo.toml b/no_std/no_std_test/Cargo.toml
index 56a73c1e..723cbdfc 100644
--- a/no_std/no_std_test/Cargo.toml
+++ b/no_std/no_std_test/Cargo.toml
@@ -1,5 +1,7 @@
 cargo-features = ["named-profiles"]
 
+[workspace]
+
 [package]
 name = "no_std_test"
 version = "0.1.0"