@@ -1084,6 +1084,7 @@ public unsafe void CrossApartmentQueryInterface_NoDeadlock()
 
                 staThread.Start();
                 mtaThread.Start();
+                testCompleted.WaitOne();
             }
             finally
             {
@@ -1092,8 +1093,6 @@ public unsafe void CrossApartmentQueryInterface_NoDeadlock()
                     Marshal.Release(agileReference);
                 }
             }
-
-            testCompleted.WaitOne();
         }
 
         [DllImport("ole32.dll")]
Original file line number	Diff line number	Diff line change
`@@ -1084,6 +1084,7 @@ public unsafe void CrossApartmentQueryInterface_NoDeadlock()`
`1084`	`1084`
`1085`	`1085`	`staThread.Start();`
`1086`	`1086`	`mtaThread.Start();`
	`1087`	`+ testCompleted.WaitOne();`
`1087`	`1088`	`}`
`1088`	`1089`	`finally`
`1089`	`1090`	`{`
`@@ -1092,8 +1093,6 @@ public unsafe void CrossApartmentQueryInterface_NoDeadlock()`
`1092`	`1093`	`Marshal.Release(agileReference);`
`1093`	`1094`	`}`
`1094`	`1095`	`}`
`1095`		`-`
`1096`		`- testCompleted.WaitOne();`
`1097`	`1096`	`}`
`1098`	`1097`
`1099`	`1098`	`[DllImport("ole32.dll")]`