diff --git a/tests/parse/test_clear_notes.py b/tests/parse/test_clear_notes.py
index a1eb13e..98ae39d 100644
--- a/tests/parse/test_clear_notes.py
+++ b/tests/parse/test_clear_notes.py
@@ -13,7 +13,7 @@
 )
 from src.token import TokenStream
 from tests.parse.templates import template_parse_invalid
-from tests.test_token import draw_token_by_value, draw_token_random
+from tests.test_token import static_token_by_value, draw_token_random
 
 
 # Dummy parse_note implementation for testing note clearing
@@ -84,7 +84,7 @@
 def error_on_token(draw, parent_context, value, error):
     tokens = draw(lists(draw_clear_notes_value()))
     # Ensure we have a value somewhere
-    start = draw(draw_token_by_value(value))
+    start = static_token_by_value(value)
     new_tokens = tokens + [start]
     context = ParseContext(ParseTask.CLEAR_NOTES, new_tokens[0], parent_context)
     for token in new_tokens:
diff --git a/tests/parse/test_note.py b/tests/parse/test_note.py
index 1411b46..6f0e0d1 100644
--- a/tests/parse/test_note.py
+++ b/tests/parse/test_note.py
@@ -20,7 +20,7 @@
     template_parse_valid,
 )
 from tests.test_token import (
-    draw_token_by_value,
+    static_token_by_value,
     draw_token_random,
 )
 
@@ -45,8 +45,8 @@
 @composite
 def draw_token_note_valid(draw):
     tokens = draw(lists(draw_note_value_token()))
-    start = draw(draw_token_by_value("StartNote"))
-    end = draw(draw_token_by_value("EndNote"))
+    start = static_token_by_value("StartNote")
+    end = static_token_by_value("EndNote")
     all_tokens = [start] + tokens + [end]
     return (all_tokens, None)
 
@@ -91,7 +91,7 @@
 @template_parse_invalid(NoteSkipper().skip_note)
 def test_parse_note_invalid_extrastartnote(draw, parent_context):
     (tokens, _) = draw(draw_token_note_valid())
-    start = draw(draw_token_by_value("StartNote"))
+    start = static_token_by_value("StartNote")
     new_tokens = insert_random_within(draw, tokens, start)
     context = ParseContext(ParseTask.PARSE_NOTE, new_tokens[0], parent_context)
     error = ParseErrorException(ParseError.FOUND_STARTNOTE, start, None, context)
diff --git a/tests/parse/test_text.py b/tests/parse/test_text.py
index 385e46b..24c9e4b 100644
--- a/tests/parse/test_text.py
+++ b/tests/parse/test_text.py
@@ -21,7 +21,7 @@
     template_parse_valid,
 )
 from tests.test_token import (
-    draw_token_by_value,
+    static_token_by_value,
     draw_token_random,
 )
 
@@ -50,8 +50,8 @@
     for token in tokens:
         buffer += token.value + " "
     value = buffer[:-1]  # Drop trailing space
-    start = draw(draw_token_by_value("StartText"))
-    end = draw(draw_token_by_value("EndText"))
+    start = static_token_by_value("StartText")
+    end = static_token_by_value("EndText")
     all_tokens = [start] + tokens + [end]
     return (all_tokens, Text(value))
 
@@ -99,7 +99,7 @@
 @template_parse_invalid(Parser().parse_text)
 def test_parse_text_invalid_extrastarttext(draw, parent_context):
     (tokens, _) = draw(draw_token_text_valid())
-    start = draw(draw_token_by_value("StartText"))
+    start = static_token_by_value("StartText")
     new_tokens = insert_random_within(draw, tokens, start)
     context = ParseContext(ParseTask.PARSE_TEXT, new_tokens[0], parent_context)
     error = ParseErrorException(ParseError.FOUND_STARTTEXT, start, None, context)
diff --git a/tests/test_token.py b/tests/test_token.py
index e7887c9..9176286 100644
--- a/tests/test_token.py
+++ b/tests/test_token.py
@@ -64,11 +64,9 @@
     pass
 
 
-# Draws a token with a specific value but random location
-@composite
-def draw_token_by_value(draw, value):
-    location = draw(draw_token_location())
-    return Token(value, location)
+# Creates a token with a specific value and static location
+def static_token_by_value(value):
+    return Token(value, static_token_location())
 
 
 # Draws a bool token