diff --git a/parley/src/tests/mod.rs b/parley/src/tests/mod.rs
index 564a06b1..09427d4d 100644
--- a/parley/src/tests/mod.rs
+++ b/parley/src/tests/mod.rs
@@ -2,5 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 mod test_basic;
+mod test_cursor;
 mod test_editor;
 mod utils;
diff --git a/parley/src/tests/test_cursor.rs b/parley/src/tests/test_cursor.rs
new file mode 100644
index 00000000..8cccac43
--- /dev/null
+++ b/parley/src/tests/test_cursor.rs
@@ -0,0 +1,31 @@
+// Copyright 2024 the Parley Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+use crate::tests::utils::CursorTest;
+use crate::{Cursor, FontContext, LayoutContext};
+
+#[test]
+fn cursor_previous_visual() {
+    let (mut lcx, mut fcx) = (LayoutContext::new(), FontContext::new());
+    let text = "Lorem ipsum dolor sit amet";
+    let layout = CursorTest::single_line(text, &mut lcx, &mut fcx);
+
+    let mut cursor: Cursor = layout.cursor_after("ipsum");
+    layout.print_cursor(cursor);
+    cursor = cursor.previous_visual(layout.layout());
+
+    layout.assert_cursor_is_before("m dolor", cursor);
+}
+
+#[test]
+fn cursor_next_visual() {
+    let (mut lcx, mut fcx) = (LayoutContext::new(), FontContext::new());
+    let text = "Lorem ipsum dolor sit amet";
+    let layout = CursorTest::single_line(text, &mut lcx, &mut fcx);
+
+    let mut cursor: Cursor = layout.cursor_before("dolor");
+    layout.print_cursor(cursor);
+    cursor = cursor.next_visual(layout.layout());
+
+    layout.assert_cursor_is_after("ipsum d", cursor);
+}
diff --git a/parley/src/tests/test_editor.rs b/parley/src/tests/test_editor.rs
index 0c1e5d80..3f322e98 100644
--- a/parley/src/tests/test_editor.rs
+++ b/parley/src/tests/test_editor.rs
@@ -3,6 +3,8 @@
 
 use crate::testenv;
 
+// TODO - Use CursorTest API for these tests
+
 #[test]
 fn editor_simple_move() {
     let mut env = testenv!();
diff --git a/parley/src/tests/utils/cursor_test.rs b/parley/src/tests/utils/cursor_test.rs
new file mode 100644
index 00000000..a7b1ced3
--- /dev/null
+++ b/parley/src/tests/utils/cursor_test.rs
@@ -0,0 +1,295 @@
+// Copyright 2024 the Parley Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+use crate::{Affinity, Cursor, FontContext, Layout, LayoutContext};
+
+// Note: This module is only compiled when running tests, which requires std,
+// so we don't have to worry about being no_std-compatible.
+
+/// Helper struct for creating cursors and checking their values.
+///
+/// This type implements multiple assertion methods which, on failure, will
+/// print the input text with cursor's expected and actual positions highlighted.
+/// This should make test failures more readable than printing the cursor's byte index.
+///
+/// The following are not supported:
+///
+/// - RTL text.
+/// - Multi-line text.
+/// - Any character that doesn't span a single terminal tile.
+/// - Multi-bytes characters.
+///
+/// Some of these limitations are inherent to visually displaying a text layout in the
+/// terminal.
+///
+/// Others will be fixed in the future.
+///
+/// # Writing tests with Parley
+///
+/// This API enables users to write tests for cursor values where the intent of
+/// the test is obvious from the code of the test alone.
+///
+/// In general, Parley tries to encourage users to write this style of test.
+/// Users should avoid tests where you compare the cursor to a numeric value
+/// (mapping a numeric value to a cursor position is not obvious) and
+/// screenshot tests (readers shouldn't need to open a screenshot file).
+pub(crate) struct CursorTest {
+    text: String,
+    layout: Layout<()>,
+}
+
+impl CursorTest {
+    pub(crate) fn single_line(
+        text: &str,
+        lcx: &mut LayoutContext<()>,
+        fcx: &mut FontContext,
+    ) -> Self {
+        let mut builder = lcx.ranged_builder(fcx, text, 1.0);
+        let mut layout = builder.build(text);
+        layout.break_all_lines(None);
+
+        // NOTE: If we want to handle more special cases, we may want to use a monospace
+        // font and use the glyph advance values to calculate the cursor position.
+
+        Self {
+            text: text.to_string(),
+            layout,
+        }
+    }
+
+    #[allow(dead_code)]
+    /// Returns the text that was used to create the layout.
+    pub(crate) fn text(&self) -> &str {
+        &self.text
+    }
+
+    /// Returns the layout that was created from the text.
+    pub(crate) fn layout(&self) -> &Layout<()> {
+        &self.layout
+    }
+
+    #[track_caller]
+    fn get_unique_index(&self, method_name: &str, needle: &str) -> usize {
+        let Some(index) = self.text.find(needle) else {
+            panic!(
+                "Error in {method_name}: needle '{needle}' not found in text '{}'",
+                self.text
+            );
+        };
+        if self.text[index + needle.len()..].contains(needle) {
+            panic!(
+                "Error in {method_name}: needle '{needle}' found multiple times in text '{}'",
+                self.text
+            );
+        }
+        index
+    }
+
+    /// Returns a cursor that points to the first character of the needle, with
+    /// [`Affinity::Downstream`].
+    ///
+    /// The needle must be unique in the text to avoid ambiguity.
+    ///
+    /// # Panics
+    ///
+    /// - If the needle is not found in the text.
+    /// - If the needle is found multiple times in the text.
+    #[track_caller]
+    pub(crate) fn cursor_before(&self, needle: &str) -> Cursor {
+        let index = self.get_unique_index("cursor_before", needle);
+        Cursor::from_byte_index(&self.layout, index, Affinity::Downstream)
+    }
+
+    /// Returns a cursor that points to the first character after the needle, with
+    /// [`Affinity::Upstream`].
+    ///
+    /// The needle must be unique in the text to avoid ambiguity.
+    ///
+    /// # Panics
+    ///
+    /// - If the needle is not found in the text.
+    /// - If the needle is found multiple times in the text.
+    #[track_caller]
+    pub(crate) fn cursor_after(&self, needle: &str) -> Cursor {
+        let index = self.get_unique_index("cursor_after", needle);
+        let index = index + needle.len();
+        Cursor::from_byte_index(&self.layout, index, Affinity::Upstream)
+    }
+
+    fn cursor_to_monospace(&self, cursor: Cursor, is_correct: bool) -> String {
+        fn check_no_color() -> bool {
+            let Some(env_var) = std::env::var_os("NO_COLOR") else {
+                return false;
+            };
+            let env_var = env_var.to_str().unwrap_or_default().trim();
+
+            if env_var == "0" {
+                return false;
+            }
+            if env_var.to_ascii_lowercase() == "false" {
+                return false;
+            }
+            true
+        }
+
+        // NOTE: The background color doesn't carry important information,
+        // so we do a simple implementation, without worrying about
+        // color-blindness and platform issues.
+        let ansi_bg_color = if cfg!(not(unix)) || check_no_color() {
+            ""
+        } else if is_correct {
+            // Green background
+            "\x1b[48;5;70m"
+        } else {
+            // Red background
+            "\x1b[48;5;160m"
+        };
+        let ansi_reset = if cfg!(not(unix)) { "" } else { "\x1b[0m" };
+        let index = cursor.index();
+        let affinity = cursor.affinity();
+
+        let cursor_str = if affinity == Affinity::Upstream {
+            // - ANSI code for 'Set background color'
+            // - Unicode sequence for '▕' character
+            // - ANSI code for 'Reset all attributes'
+            format!("{ansi_bg_color}\u{2595}{ansi_reset}")
+        } else {
+            // - 1 space
+            // - ANSI code for 'Set background color'
+            // - Unicode sequence for '▏' character
+            // - ANSI code for 'Reset all attributes'
+            format!(" {ansi_bg_color}\u{258F}{ansi_reset}")
+        };
+
+        // FIXME - This assumes that the byte index of a string matches how many
+        // terminal tiles that string occupies. This is wrong for even trivial
+        // cases (eg unicode characters spanning multiple code points).
+        " ".repeat(index) + &cursor_str
+    }
+
+    #[track_caller]
+    fn cursor_assertion(&self, expected: Cursor, actual: Cursor) {
+        if expected == actual {
+            return;
+        }
+
+        // TODO - Check that the tested string doesn't include difficult
+        // characters (newlines, tabs, RTL text, etc.)
+        // If it does, we should still print the text on a best effort basis, but
+        // without visual cursors and with a warning that the text may not be accurate.
+
+        // We may also render the text to an image, with the cursor highlighted, and
+        // save it to a temporary file, or even print it to the terminal (if the
+        // terminal supports images).
+        // The image would NOT be used for screenshot testing, but it would be useful for
+        // debugging.
+
+        panic!(
+            concat!(
+                "cursor assertion failed\n",
+                "  expected: '{text}' - ({expected_index}, {expected_affinity:?})\n",
+                "            {expected_cursor}\n",
+                "       got: '{text}' - ({actual_index}, {actual_affinity:?})\n",
+                "            {actual_cursor}\n",
+            ),
+            text = self.text,
+            expected_index = expected.index(),
+            expected_affinity = expected.affinity(),
+            actual_index = actual.index(),
+            actual_affinity = actual.affinity(),
+            expected_cursor = self.cursor_to_monospace(expected, true),
+            actual_cursor = self.cursor_to_monospace(actual, false),
+        );
+    }
+
+    /// Asserts that the cursor is before the needle.
+    ///
+    /// The needle must be unique in the text to avoid ambiguity.
+    ///
+    /// # Panics
+    ///
+    /// - If the needle is not found in the text.
+    /// - If the needle is found multiple times in the text.
+    /// - If the cursor has the wrong position.
+    /// - If the cursor doesn't have [`Affinity::Downstream`].
+    #[track_caller]
+    pub(crate) fn assert_cursor_is_before(&self, needle: &str, cursor: Cursor) {
+        let index = self.get_unique_index("assert_cursor_is_before", needle);
+
+        let expected_cursor = Cursor::from_byte_index(&self.layout, index, Affinity::Downstream);
+        self.cursor_assertion(expected_cursor, cursor);
+    }
+
+    /// Asserts that the cursor is after the needle.
+    ///
+    /// The needle must be unique in the text to avoid ambiguity.
+    ///
+    /// # Panics
+    ///
+    /// - If the needle is not found in the text.
+    /// - If the needle is found multiple times in the text.
+    /// - If the cursor has the wrong position.
+    /// - If the cursor doesn't have [`Affinity::Upstream`].
+    #[track_caller]
+    pub(crate) fn assert_cursor_is_after(&self, needle: &str, cursor: Cursor) {
+        let index = self.get_unique_index("assert_cursor_is_after", needle);
+        let index = index + needle.len();
+
+        let expected_cursor = Cursor::from_byte_index(&self.layout, index, Affinity::Upstream);
+        self.cursor_assertion(expected_cursor, cursor);
+    }
+
+    /// Compares two cursors and asserts that they are the same.
+    ///
+    /// # Panics
+    ///
+    /// - If the cursors don't have the same index.
+    /// - If the cursors don't have the same affinity.
+    #[allow(dead_code)]
+    #[track_caller]
+    pub(crate) fn assert_cursor_is(&self, expected: Cursor, cursor: Cursor) {
+        self.cursor_assertion(expected, cursor);
+    }
+
+    /// Prints the text this object was created with, with the cursor highlighted.
+    ///
+    /// Uses the same format as assertion failures.
+    #[track_caller]
+    #[allow(clippy::print_stderr)]
+    pub(crate) fn print_cursor(&self, cursor: Cursor) {
+        eprintln!(
+            concat!(
+                "dumping test layout value\n",
+                "      text: '{text}' - ({actual_index}, {actual_affinity:?})\n",
+                "            {actual_cursor}\n",
+            ),
+            text = self.text,
+            actual_index = cursor.index(),
+            actual_affinity = cursor.affinity(),
+            actual_cursor = self.cursor_to_monospace(cursor, true),
+        );
+    }
+
+    // TODO - Add a render_cursor method that creates an image of the text, with
+    // the cursor highlighted. See comment in `cursor_assertion()` for details.
+}
+
+// ---
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn cursor_next_visual() {
+        let (mut lcx, mut fcx) = (LayoutContext::new(), FontContext::new());
+        let text = "Lorem ipsum dolor sit amet";
+        let layout = CursorTest::single_line(text, &mut lcx, &mut fcx);
+
+        let mut cursor: Cursor = layout.cursor_before("dolor");
+        layout.print_cursor(cursor);
+        cursor = cursor.next_visual(&layout.layout);
+
+        layout.assert_cursor_is_after("ipsum d", cursor);
+    }
+}
diff --git a/parley/src/tests/utils/mod.rs b/parley/src/tests/utils/mod.rs
index 93396911..e8be844b 100644
--- a/parley/src/tests/utils/mod.rs
+++ b/parley/src/tests/utils/mod.rs
@@ -1,7 +1,9 @@
 // Copyright 2024 the Parley Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
+mod cursor_test;
 mod env;
 mod renderer;
 
+pub(crate) use cursor_test::CursorTest;
 pub(crate) use env::TestEnv;