diff --git a/UnitTests/SoarTestAgents/Chunking/expected/ChunkingTests_Superstate_Identity_Opaque_Old_Singleton_Behavior_expected.soar b/UnitTests/SoarTestAgents/Chunking/expected/ChunkingTests_Superstate_Identity_Opaque_Old_Singleton_Behavior_expected.soar
new file mode 100644
index 0000000000..d4f2510de4
--- /dev/null
+++ b/UnitTests/SoarTestAgents/Chunking/expected/ChunkingTests_Superstate_Identity_Opaque_Old_Singleton_Behavior_expected.soar
@@ -0,0 +1,7 @@
+sp {answer*make*t2-1
+    (state <s1> ^superstate nil ^foo2 { <f1> <> homer } ^foo { <f2> <> bart }
+          ^foo { <f3> <> simpson })
+    -->
+    (<s1> ^test-done true)
+}
+
diff --git a/UnitTests/SoarTestAgents/Chunking/tests/ChunkingTests_Superstate_Identity_Opaque_Old_Singleton_Behavior.soar b/UnitTests/SoarTestAgents/Chunking/tests/ChunkingTests_Superstate_Identity_Opaque_Old_Singleton_Behavior.soar
new file mode 100644
index 0000000000..3fbf496c06
--- /dev/null
+++ b/UnitTests/SoarTestAgents/Chunking/tests/ChunkingTests_Superstate_Identity_Opaque_Old_Singleton_Behavior.soar
@@ -0,0 +1,76 @@
+# Tests:
+# - Two conditions in two tests backtraced through that test the same constant in the same wme in the top state
+#   - Should not appear as same condition or variable in chunk
+# - Two conditions in two tests backtraced through, one that tests a constant in the top state and one
+#   that tests a copy of it made on the top state
+
+srand 23
+chunk always
+chunk automatically-create-singletons off
+
+sp {init-superstate
+    (state <s> ^superstate nil)
+-->
+    (<s> ^foo bar)
+    (write (crlf) |Starting chunking unit test.|)
+}
+
+sp {elab-superstate
+    (state <s> ^{ << foo foot >> <a> } <v>)
+-->
+    (<s> ^foo2 <v>)
+    (write (crlf) |Starting chunking unit test.|)
+}
+
+sp {apply*test-done
+    (state <s> ^superstate nil ^test-done)
+-->
+    (write (crlf) |Chunk produced. Test completed.|)
+    (succeeded)
+    (interrupt)
+}
+
+sp {apply*test-failed
+    (state <s> ^superstate.superstate.superstate.superstate nil)
+-->
+    (write (crlf) |Chunk not produced.  Test failed.|)
+    (interrupt)
+}
+
+sp {propose*test
+    (state <s> ^superstate.superstate nil)
+-->
+    (<s> ^operator <o> +)}
+
+sp {apply-bt1
+    (state <s> ^operator
+               ^superstate <ss>)
+    (<ss> ^foo {<> bart <x>}
+          ^foo2 {<> homer <z>})
+    -->
+    (<s> ^continue1 true)
+}
+
+sp {apply-bt2
+    (state <s> ^operator
+               ^superstate <ss>)
+    (<ss> ^foo {<> simpson <y>})
+-->
+    (<s> ^continue2 true)
+}
+
+sp {apply-bt3
+    (state <s> ^operator
+               ^superstate <ss>)
+-->
+    (<s> ^continue3 true)
+}
+
+sp {make
+    (state <s> ^operator
+               ^continue1
+               ^continue2
+               ^superstate <ss>)
+-->
+    (<ss> ^test-done true +)
+}
\ No newline at end of file
diff --git a/UnitTests/SoarUnitTests/ChunkingTests.cpp b/UnitTests/SoarUnitTests/ChunkingTests.cpp
index 20be60c23d..6b824a7854 100644
--- a/UnitTests/SoarUnitTests/ChunkingTests.cpp
+++ b/UnitTests/SoarUnitTests/ChunkingTests.cpp
@@ -88,6 +88,7 @@ void ChunkingTests::STI_Variablization_Same_Type()                    { check_ch
 void ChunkingTests::STI_Variablization()                              { check_chunk("STI_Variablization", 8, 1); }
 void ChunkingTests::STI_with_referents()                              { check_chunk("STI_with_referents", 8, 1); }
 void ChunkingTests::Superstate_Identity_Opaque()                      { check_chunk("Superstate_Identity_Opaque", 8, 1); }
+void ChunkingTests::Superstate_Identity_Opaque_Old_Singleton_Behavior() { check_chunk("Superstate_Identity_Opaque_Old_Singleton_Behavior", 8, 1); }
 void ChunkingTests::Ungrounded_in_BT_Constraint()                     { check_chunk("Ungrounded_in_BT_Constraint", 8, 2); }
 void ChunkingTests::Ungrounded_Mixed()                                { check_chunk("Ungrounded_Mixed", 8, 1); }
 void ChunkingTests::Ungrounded_Relational_Constraint()                { check_chunk("Ungrounded_Relational_Constraint", 8, 1); }
diff --git a/UnitTests/SoarUnitTests/ChunkingTests.hpp b/UnitTests/SoarUnitTests/ChunkingTests.hpp
index 26ccf3adc3..0eeb45be99 100644
--- a/UnitTests/SoarUnitTests/ChunkingTests.hpp
+++ b/UnitTests/SoarUnitTests/ChunkingTests.hpp
@@ -36,6 +36,7 @@ class ChunkingTests : public FunctionalTestHarness
     TEST(Maintain_Instantiation_Specific_Identity, -1);
     TEST(Opaque_State_Barrier, -1);
     TEST(Superstate_Identity_Opaque, -1);
+    TEST(Superstate_Identity_Opaque_Old_Singleton_Behavior, -1);
     TEST(STI_Variablization, -1);
     TEST(STI_with_referents, -1);
     TEST(Conflated_Constants, -1);
@@ -192,6 +193,7 @@ class ChunkingTests : public FunctionalTestHarness
     void STI_Variablization();
     void STI_with_referents();
     void Superstate_Identity_Opaque();
+    void Superstate_Identity_Opaque_Old_Singleton_Behavior();
     void Ungrounded_in_BT_Constraint();
     void Ungrounded_Mixed();
     void Ungrounded_Relational_Constraint();