diff --git a/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_all-2.snap b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_all-2.snap
new file mode 100644
index 00000000..d73ce024
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_all-2.snap
@@ -0,0 +1,156 @@
+---
+source: rojo-test/src/serve_test.rs
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+---
+instances:
+  id-10:
+    Children: []
+    ClassName: StringValue
+    Id: id-10
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "6"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #6"
+  id-11:
+    Children: []
+    ClassName: StringValue
+    Id: id-11
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "7"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #7"
+  id-12:
+    Children: []
+    ClassName: StringValue
+    Id: id-12
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "8"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #8"
+  id-13:
+    Children: []
+    ClassName: StringValue
+    Id: id-13
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "9"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #9"
+  id-2:
+    Children:
+      - id-3
+    ClassName: Folder
+    Id: id-2
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: move_folder_of_stuff
+    Parent: ~
+    Properties: {}
+  id-3:
+    Children:
+      - id-4
+      - id-5
+      - id-6
+      - id-7
+      - id-8
+      - id-9
+      - id-10
+      - id-11
+      - id-12
+      - id-13
+    ClassName: Folder
+    Id: id-3
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: new-stuff
+    Parent: id-2
+    Properties: {}
+  id-4:
+    Children: []
+    ClassName: StringValue
+    Id: id-4
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "0"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #0"
+  id-5:
+    Children: []
+    ClassName: StringValue
+    Id: id-5
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "1"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #1"
+  id-6:
+    Children: []
+    ClassName: StringValue
+    Id: id-6
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "2"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #2"
+  id-7:
+    Children: []
+    ClassName: StringValue
+    Id: id-7
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "3"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #3"
+  id-8:
+    Children: []
+    ClassName: StringValue
+    Id: id-8
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "4"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #4"
+  id-9:
+    Children: []
+    ClassName: StringValue
+    Id: id-9
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: "5"
+    Parent: id-3
+    Properties:
+      Value:
+        Type: String
+        Value: "File #5"
+messageCursor: 1
+sessionId: id-1
diff --git a/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_all.snap b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_all.snap
new file mode 100644
index 00000000..2f0cfd81
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_all.snap
@@ -0,0 +1,16 @@
+---
+source: rojo-test/src/serve_test.rs
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+---
+instances:
+  id-2:
+    Children: []
+    ClassName: Folder
+    Id: id-2
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: move_folder_of_stuff
+    Parent: ~
+    Properties: {}
+messageCursor: 0
+sessionId: id-1
diff --git a/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_info.snap b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_info.snap
new file mode 100644
index 00000000..f826d7e7
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_info.snap
@@ -0,0 +1,9 @@
+---
+source: rojo-test/src/serve_test.rs
+expression: redactions.redacted_yaml(info)
+---
+expectedPlaceIds: ~
+protocolVersion: 3
+rootInstanceId: id-2
+serverVersion: 0.6.0-dev
+sessionId: id-1
diff --git a/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_subscribe.snap b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_subscribe.snap
new file mode 100644
index 00000000..5ba30e26
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_subscribe.snap
@@ -0,0 +1,149 @@
+---
+source: rojo-test/src/serve_test.rs
+expression: "subscribe_response.intern_and_redact(&mut redactions, ())"
+---
+messageCursor: 1
+messages:
+  - addedInstances:
+      id-10:
+        Children: []
+        ClassName: StringValue
+        Id: id-10
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "6"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #6"
+      id-11:
+        Children: []
+        ClassName: StringValue
+        Id: id-11
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "7"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #7"
+      id-12:
+        Children: []
+        ClassName: StringValue
+        Id: id-12
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "8"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #8"
+      id-13:
+        Children: []
+        ClassName: StringValue
+        Id: id-13
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "9"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #9"
+      id-3:
+        Children:
+          - id-4
+          - id-5
+          - id-6
+          - id-7
+          - id-8
+          - id-9
+          - id-10
+          - id-11
+          - id-12
+          - id-13
+        ClassName: Folder
+        Id: id-3
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: new-stuff
+        Parent: id-2
+        Properties: {}
+      id-4:
+        Children: []
+        ClassName: StringValue
+        Id: id-4
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "0"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #0"
+      id-5:
+        Children: []
+        ClassName: StringValue
+        Id: id-5
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "1"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #1"
+      id-6:
+        Children: []
+        ClassName: StringValue
+        Id: id-6
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "2"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #2"
+      id-7:
+        Children: []
+        ClassName: StringValue
+        Id: id-7
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "3"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #3"
+      id-8:
+        Children: []
+        ClassName: StringValue
+        Id: id-8
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "4"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #4"
+      id-9:
+        Children: []
+        ClassName: StringValue
+        Id: id-9
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: "5"
+        Parent: id-3
+        Properties:
+          Value:
+            Type: String
+            Value: "File #5"
+    removedInstances: []
+    updatedInstances: []
+sessionId: id-1
diff --git a/rojo-test/src/serve_test.rs b/rojo-test/src/serve_test.rs
index e2335838..2b6394b4 100644
--- a/rojo-test/src/serve_test.rs
+++ b/rojo-test/src/serve_test.rs
@@ -102,7 +102,6 @@ fn add_folder() {
 }
 
 #[test]
-#[ignore]
 fn move_folder_of_stuff() {
     run_serve_test("move_folder_of_stuff", |session, mut redactions| {
         let info = session.get_api_rojo().unwrap();