diff --git a/src/test/codegen/iterate-over-array.cc b/src/test/codegen/iterate-over-array.cc
new file mode 100644
index 00000000000..7eca21b13d7
--- /dev/null
+++ b/src/test/codegen/iterate-over-array.cc
@@ -0,0 +1,17 @@
+#include <stdlib.h>
+#include <assert.h>
+
+struct slice {
+  int const *p;
+  size_t len;
+};
+
+extern "C"
+size_t test(slice s) {
+  size_t y = 0;
+  for (int i = 0; i < s.len; ++i) {
+	assert(i < s.len);
+	y += s.p[i];
+  }
+  return y;
+}
diff --git a/src/test/codegen/iterate-over-array.rs b/src/test/codegen/iterate-over-array.rs
new file mode 100644
index 00000000000..cf54e6eafba
--- /dev/null
+++ b/src/test/codegen/iterate-over-array.rs
@@ -0,0 +1,10 @@
+#[no_mangle]
+fn test(x: &[int]) -> int {
+    let mut y = 0;
+    let mut i = 0;
+    while (i < x.len()) {
+        y += x[i];
+        i += 1;
+    }
+    y
+}
diff --git a/src/test/codegen/scalar-function-call.cc b/src/test/codegen/scalar-function-call.cc
new file mode 100644
index 00000000000..91ed882f68a
--- /dev/null
+++ b/src/test/codegen/scalar-function-call.cc
@@ -0,0 +1,10 @@
+#include <stdlib.h>
+
+size_t foo(size_t x) {
+    return x * x;
+}
+
+extern "C"
+void test() {
+    size_t x = foo(10);
+}
diff --git a/src/test/codegen/scalar-function-call.rs b/src/test/codegen/scalar-function-call.rs
new file mode 100644
index 00000000000..7e4a566749b
--- /dev/null
+++ b/src/test/codegen/scalar-function-call.rs
@@ -0,0 +1,8 @@
+fn foo(x: int) -> int {
+    x * x
+}
+
+#[no_mangle]
+fn test() {
+    let x = foo(10);
+}
diff --git a/src/test/codegen/small-dense-int-switch.cc b/src/test/codegen/small-dense-int-switch.cc
new file mode 100644
index 00000000000..87bc5bf852e
--- /dev/null
+++ b/src/test/codegen/small-dense-int-switch.cc
@@ -0,0 +1,11 @@
+#include <stdlib.h>
+
+extern "C"
+size_t test(size_t x, size_t y) {
+  switch (x) {
+  case 1: return y;
+  case 2: return y*2;
+  case 4: return y*3;
+  default: return 11;
+  }
+}
diff --git a/src/test/codegen/small-dense-int-switch.rs b/src/test/codegen/small-dense-int-switch.rs
new file mode 100644
index 00000000000..6840dc7411b
--- /dev/null
+++ b/src/test/codegen/small-dense-int-switch.rs
@@ -0,0 +1,9 @@
+#[no_mangle]
+fn test(x: int, y: int) -> int {
+    match x {
+        1 => y,
+        2 => y*2,
+        4 => y*3,
+        _ => 11
+    }
+}
diff --git a/src/test/codegen/hello.cc b/src/test/codegen/stack-alloc-string-slice.cc
similarity index 100%
rename from src/test/codegen/hello.cc
rename to src/test/codegen/stack-alloc-string-slice.cc
diff --git a/src/test/codegen/hello.rs b/src/test/codegen/stack-alloc-string-slice.rs
similarity index 100%
rename from src/test/codegen/hello.rs
rename to src/test/codegen/stack-alloc-string-slice.rs