diff --git a/rojo-test/serve-tests/add_folder/.gitkeep b/rojo-test/serve-tests/add_folder/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/rojo-test/src/serve_test.rs b/rojo-test/src/serve_test.rs
index 7b1c3fc0..7a322e53 100644
--- a/rojo-test/src/serve_test.rs
+++ b/rojo-test/src/serve_test.rs
@@ -69,3 +69,35 @@ fn just_txt() {
         // TODO: Directly served files currently don't trigger changed events!
     });
 }
+
+// TODO: Rojo doesn't currently handle files/folders being added.
+#[test]
+#[ignore]
+fn add_folder() {
+    run_serve_test("add_folder", |session, mut redactions| {
+        let info = session.get_api_rojo().unwrap();
+        let root_id = info.root_instance_id;
+
+        assert_yaml_snapshot!("add_folder_info", redactions.redacted_yaml(info));
+
+        let read_response = session.get_api_read(root_id).unwrap();
+        assert_yaml_snapshot!(
+            "add_folder_all",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
+
+        fs::create_dir(session.path().join("my-new-folder")).unwrap();
+
+        let subscribe_response = session.get_api_subscribe(0).unwrap();
+        assert_yaml_snapshot!(
+            "add_folder_subscribe",
+            redactions.redacted_yaml(subscribe_response)
+        );
+
+        let read_response = session.get_api_read(root_id).unwrap();
+        assert_yaml_snapshot!(
+            "add_folder_all-2",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
+    });
+}