diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 87599c1..2bfb85b 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -4,6 +4,9 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);EF1001;xUnit1003;xUnit1013</NoWarn>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    
+    <!-- TODO: Change to "'$(FixedTestOrder)' != 'true'" once test suite is stable. -->
+    <DefineConstants Condition="'$(FixedTestOrder)' != 'false'">$(DefineConstants);FIXED_TEST_ORDER</DefineConstants>
   </PropertyGroup>
 
 </Project>
diff --git a/test/EFCore.Jet.FunctionalTests/Properties/AssemblyInfo.cs b/test/EFCore.Jet.FunctionalTests/Properties/AssemblyInfo.cs
index 5be9a05..a39e37a 100644
--- a/test/EFCore.Jet.FunctionalTests/Properties/AssemblyInfo.cs
+++ b/test/EFCore.Jet.FunctionalTests/Properties/AssemblyInfo.cs
@@ -7,6 +7,10 @@ using Xunit;
 // Set assembly wide conditions to control tests in accordance with the environment they are run in.
 [assembly: JetConfiguredCondition]
 
+#if FIXED_TEST_ORDER
+
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 [assembly: TestCollectionOrderer("EntityFrameworkCore.Jet.FunctionalTests.TestUtilities.Xunit." + nameof(AscendingTestCollectionOrderer), "EntityFrameworkCore.Jet.FunctionalTests")]
-[assembly: TestCaseOrderer("EntityFrameworkCore.Jet.FunctionalTests.TestUtilities.Xunit." + nameof(AscendingTestCaseOrderer), "EntityFrameworkCore.Jet.FunctionalTests")]
\ No newline at end of file
+[assembly: TestCaseOrderer("EntityFrameworkCore.Jet.FunctionalTests.TestUtilities.Xunit." + nameof(AscendingTestCaseOrderer), "EntityFrameworkCore.Jet.FunctionalTests")]
+
+#endif
diff --git a/test/EFCore.Jet.Tests/Properties/AssemblyInfo.cs b/test/EFCore.Jet.Tests/Properties/AssemblyInfo.cs
index d33a739..959e8d4 100644
--- a/test/EFCore.Jet.Tests/Properties/AssemblyInfo.cs
+++ b/test/EFCore.Jet.Tests/Properties/AssemblyInfo.cs
@@ -3,7 +3,10 @@
 using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities.Xunit;
 using Xunit;
 
-// Set assembly wide conditions to control tests in accordance with the environment they are run in.
+#if FIXED_TEST_ORDER
+
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 [assembly: TestCollectionOrderer("EntityFrameworkCore.Jet.FunctionalTests.TestUtilities.Xunit." + nameof(AscendingTestCollectionOrderer), "EntityFrameworkCore.Jet.FunctionalTests")]
-[assembly: TestCaseOrderer("EntityFrameworkCore.Jet.FunctionalTests.TestUtilities.Xunit." + nameof(AscendingTestCaseOrderer), "EntityFrameworkCore.Jet.FunctionalTests")]
\ No newline at end of file
+[assembly: TestCaseOrderer("EntityFrameworkCore.Jet.FunctionalTests.TestUtilities.Xunit." + nameof(AscendingTestCaseOrderer), "EntityFrameworkCore.Jet.FunctionalTests")]
+
+#endif
\ No newline at end of file