diff --git a/test/transforms/fixtures/on-history/undo/add-mark/index.js b/test/transforms/fixtures/on-history/undo/add-mark/index.js
new file mode 100644
index 000000000..72da1c68a
--- /dev/null
+++ b/test/transforms/fixtures/on-history/undo/add-mark/index.js
@@ -0,0 +1,18 @@
+
+import assert from 'assert'
+
+export default function (state) {
+  const { selection } = state
+
+  const next = state
+    .transform()
+    .addMarkByKey('key1', 0, 8, 'marktype')
+    .apply()
+
+    .transform()
+    .undo()
+    .apply()
+
+  assert.deepEqual(next.selection.toJS(), selection.toJS())
+  return next
+}
diff --git a/test/transforms/fixtures/on-history/undo/add-mark/input.yaml b/test/transforms/fixtures/on-history/undo/add-mark/input.yaml
new file mode 100644
index 000000000..4089e48f0
--- /dev/null
+++ b/test/transforms/fixtures/on-history/undo/add-mark/input.yaml
@@ -0,0 +1,8 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        key: 'key1'
+        text: The text
diff --git a/test/transforms/fixtures/on-history/undo/add-mark/output.yaml b/test/transforms/fixtures/on-history/undo/add-mark/output.yaml
new file mode 100644
index 000000000..4089e48f0
--- /dev/null
+++ b/test/transforms/fixtures/on-history/undo/add-mark/output.yaml
@@ -0,0 +1,8 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        key: 'key1'
+        text: The text
diff --git a/test/transforms/fixtures/on-history/undo/remove-mark/index.js b/test/transforms/fixtures/on-history/undo/remove-mark/index.js
new file mode 100644
index 000000000..2e5bbace0
--- /dev/null
+++ b/test/transforms/fixtures/on-history/undo/remove-mark/index.js
@@ -0,0 +1,18 @@
+
+import assert from 'assert'
+
+export default function (state) {
+  const { selection } = state
+
+  const next = state
+    .transform()
+    .removeMarkByKey('key1', 0, 8, 'mark')
+    .apply()
+
+    .transform()
+    .undo()
+    .apply()
+
+  assert.deepEqual(next.selection.toJS(), selection.toJS())
+  return next
+}
diff --git a/test/transforms/fixtures/on-history/undo/remove-mark/input.yaml b/test/transforms/fixtures/on-history/undo/remove-mark/input.yaml
new file mode 100644
index 000000000..4b1f43e85
--- /dev/null
+++ b/test/transforms/fixtures/on-history/undo/remove-mark/input.yaml
@@ -0,0 +1,11 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        key: 'key1'
+        ranges:
+          - text: The text
+            marks:
+              - type: 'mark'
diff --git a/test/transforms/fixtures/on-history/undo/remove-mark/output.yaml b/test/transforms/fixtures/on-history/undo/remove-mark/output.yaml
new file mode 100644
index 000000000..4b1f43e85
--- /dev/null
+++ b/test/transforms/fixtures/on-history/undo/remove-mark/output.yaml
@@ -0,0 +1,11 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        key: 'key1'
+        ranges:
+          - text: The text
+            marks:
+              - type: 'mark'