diff --git a/test/data/highlight-312.right b/test/data/highlight-312.right
new file mode 100644
index 00000000..71e70ac8
--- /dev/null
+++ b/test/data/highlight-312.right
@@ -0,0 +1,12 @@
+(gcd.py:1): <module>
+-> 1 #!/usr/bin/env python3
+Set basename is on.
+Set event is on.
+Set stopping is off.
+output set to not use terminal escape sequences
+output set to not use terminal escape sequences
+output set to not use terminal escape sequences
+output set to not use terminal escape sequences
+output set for terminal with escape sequences for a dark background
+output set for terminal with escape sequences for a light background
+trepan3k: That's all, folks...
diff --git a/test/data/step-312.right b/test/data/step-312.right
new file mode 100644
index 00000000..7bfbcaec
--- /dev/null
+++ b/test/data/step-312.right
@@ -0,0 +1,22 @@
+(gcd.py:1): <module>
+-> 1 #!/usr/bin/env python3
+Set basename is on.
+Set event is on.
+Set stopping is off.
+Set confirmation is off.
+line - gcd.py:2
+(gcd.py:2): <module>
+-- 2 """Greatest Common Divisor
+  2  ->	"""Greatest Common Divisor
+Set stopping is on.
+line - gcd.py:11
+(gcd.py:11): <module>
+-- 11 import sys
+ 11  ->	import sys
+Set stopping is off.
+line - gcd.py:13
+line - gcd.py:26
+(gcd.py:26): <module>
+-- 26 def gcd(a,b):
+ 26  ->	def gcd(a,b):
+trepan3k: That's all, folks...
diff --git a/test/integration/test_highlight.py b/test/integration/test_highlight.py
index 72bd96c9..612ceea7 100644
--- a/test/integration/test_highlight.py
+++ b/test/integration/test_highlight.py
@@ -6,7 +6,9 @@
 
 def test_highlight():
     """Test set/show highlight"""
-    if PYTHON_VERSION_TRIPLE >= (3, 8):
+    if PYTHON_VERSION_TRIPLE >= (3, 12):
+        right_template = "%s-312.right"
+    elif PYTHON_VERSION_TRIPLE >= (3, 8):
         right_template = "%s-38.right"
     else:
         right_template = None
diff --git a/test/integration/test_step.py b/test/integration/test_step.py
index c2078a80..8ed5d9ae 100644
--- a/test/integration/test_step.py
+++ b/test/integration/test_step.py
@@ -6,7 +6,9 @@
 
 def test_step():
     """Test stepping, set skip, set trace"""
-    if PYTHON_VERSION_TRIPLE >= (3, 8):
+    if PYTHON_VERSION_TRIPLE >= (3, 12):
+        right_template = "%s-312.right"
+    elif PYTHON_VERSION_TRIPLE >= (3, 8):
         right_template = "%s-38.right"
     else:
         right_template = None