diff --git a/rojo-test/build-tests/client_in_folder/default.project.json b/rojo-test/build-tests/client_in_folder/default.project.json
new file mode 100644
index 00000000..6e6f94d3
--- /dev/null
+++ b/rojo-test/build-tests/client_in_folder/default.project.json
@@ -0,0 +1,6 @@
+{
+  "name": "client_in_folder",
+  "tree": {
+    "$path": "folder"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/build-tests/client_in_folder/folder/localScript.client.lua b/rojo-test/build-tests/client_in_folder/folder/localScript.client.lua
new file mode 100644
index 00000000..849d9791
--- /dev/null
+++ b/rojo-test/build-tests/client_in_folder/folder/localScript.client.lua
@@ -0,0 +1 @@
+-- This is a Lua client script
\ No newline at end of file
diff --git a/rojo-test/build-tests/module_in_folder/default.project.json b/rojo-test/build-tests/module_in_folder/default.project.json
new file mode 100644
index 00000000..4d98a2d2
--- /dev/null
+++ b/rojo-test/build-tests/module_in_folder/default.project.json
@@ -0,0 +1,6 @@
+{
+  "name": "module_in_folder",
+  "tree": {
+    "$path": "folder"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/build-tests/module_in_folder/folder/aModule.lua b/rojo-test/build-tests/module_in_folder/folder/aModule.lua
new file mode 100644
index 00000000..9f842de3
--- /dev/null
+++ b/rojo-test/build-tests/module_in_folder/folder/aModule.lua
@@ -0,0 +1 @@
+-- This is a Lua module
\ No newline at end of file
diff --git a/rojo-test/build-tests/server_in_folder/default.project.json b/rojo-test/build-tests/server_in_folder/default.project.json
new file mode 100644
index 00000000..ca33d6cd
--- /dev/null
+++ b/rojo-test/build-tests/server_in_folder/default.project.json
@@ -0,0 +1,6 @@
+{
+  "name": "server_in_folder",
+  "tree": {
+    "$path": "folder"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/build-tests/server_in_folder/folder/serverScript.server.lua b/rojo-test/build-tests/server_in_folder/folder/serverScript.server.lua
new file mode 100644
index 00000000..dd72db00
--- /dev/null
+++ b/rojo-test/build-tests/server_in_folder/folder/serverScript.server.lua
@@ -0,0 +1 @@
+-- This is a Lua server script
\ No newline at end of file
diff --git a/rojo-test/src/build_test.rs b/rojo-test/src/build_test.rs
index 3d2734f3..bcd2e750 100644
--- a/rojo-test/src/build_test.rs
+++ b/rojo-test/src/build_test.rs
@@ -21,7 +21,10 @@ macro_rules! gen_build_tests {
 }
 
 gen_build_tests! {
+    client_in_folder,
     gitkeep,
+    module_in_folder,
+    server_in_folder,
     txt_in_folder,
 }
 
diff --git a/rojo-test/src/snapshots/build_test__client_in_folder.snap b/rojo-test/src/snapshots/build_test__client_in_folder.snap
new file mode 100644
index 00000000..d43e50c2
--- /dev/null
+++ b/rojo-test/src/snapshots/build_test__client_in_folder.snap
@@ -0,0 +1,19 @@
+---
+created: "2019-08-09T01:29:47.650277200Z"
+creator: insta@0.10.0
+source: rojo-test/src/build_test.rs
+expression: contents
+---
+<roblox version="4">
+  <Item class="Folder" referent="0">
+    <Properties>
+      <string name="Name">client_in_folder</string>
+    </Properties>
+    <Item class="LocalScript" referent="1">
+      <Properties>
+        <string name="Name">localScript</string>
+        <string name="Source">-- This is a Lua client script</string>
+      </Properties>
+    </Item>
+  </Item>
+</roblox>
diff --git a/rojo-test/src/snapshots/build_test__module_in_folder.snap b/rojo-test/src/snapshots/build_test__module_in_folder.snap
new file mode 100644
index 00000000..dd5d9895
--- /dev/null
+++ b/rojo-test/src/snapshots/build_test__module_in_folder.snap
@@ -0,0 +1,19 @@
+---
+created: "2019-08-09T01:27:22.597759700Z"
+creator: insta@0.10.0
+source: rojo-test/src/build_test.rs
+expression: contents
+---
+<roblox version="4">
+  <Item class="Folder" referent="0">
+    <Properties>
+      <string name="Name">module_in_folder</string>
+    </Properties>
+    <Item class="ModuleScript" referent="1">
+      <Properties>
+        <string name="Name">aModule</string>
+        <string name="Source">-- This is a Lua module</string>
+      </Properties>
+    </Item>
+  </Item>
+</roblox>
diff --git a/rojo-test/src/snapshots/build_test__server_in_folder.snap b/rojo-test/src/snapshots/build_test__server_in_folder.snap
new file mode 100644
index 00000000..14037d0a
--- /dev/null
+++ b/rojo-test/src/snapshots/build_test__server_in_folder.snap
@@ -0,0 +1,19 @@
+---
+created: "2019-08-09T01:29:48.071133300Z"
+creator: insta@0.10.0
+source: rojo-test/src/build_test.rs
+expression: contents
+---
+<roblox version="4">
+  <Item class="Folder" referent="0">
+    <Properties>
+      <string name="Name">server_in_folder</string>
+    </Properties>
+    <Item class="Script" referent="1">
+      <Properties>
+        <string name="Name">serverScript</string>
+        <string name="Source">-- This is a Lua server script</string>
+      </Properties>
+    </Item>
+  </Item>
+</roblox>