Index: tests/concurrent/park/contention.cfa
===================================================================
--- tests/concurrent/park/contention.cfa	(revision dfa43602bd7af4000c92703f5f8bd89e83da1bab)
+++ tests/concurrent/park/contention.cfa	(revision ae663481b425267fa525cf57f1c7d142873a3514)
@@ -21,9 +21,9 @@
 		if(blocked[idx]) {
 			Thread * thrd = __atomic_exchange_n(&blocked[idx], 0p, __ATOMIC_SEQ_CST);
-			unpark( *thrd );
+			unpark( *thrd __cfaabi_dbg_ctx2 );
 		} else {
 			Thread * thrd = __atomic_exchange_n(&blocked[idx], &this, __ATOMIC_SEQ_CST);
-			unpark( *thrd);
-			park();
+			unpark( *thrd __cfaabi_dbg_ctx2 );
+			park( __cfaabi_dbg_ctx );
 		}
 	}
@@ -41,5 +41,5 @@
 			int idx = myrand() % blocked_size;
 			Thread * thrd = __atomic_exchange_n(&blocked[idx], 0p, __ATOMIC_SEQ_CST);
-			unpark( *thrd );
+			unpark( *thrd __cfaabi_dbg_ctx2 );
 			yield( myrand() % 20 );
 		}
Index: tests/concurrent/park/force_preempt.cfa
===================================================================
--- tests/concurrent/park/force_preempt.cfa	(revision dfa43602bd7af4000c92703f5f8bd89e83da1bab)
+++ tests/concurrent/park/force_preempt.cfa	(revision ae663481b425267fa525cf57f1c7d142873a3514)
@@ -30,5 +30,5 @@
 
 		// Unpark this thread, don't force a yield
-		unpark(this);
+		unpark( this __cfaabi_dbg_ctx2 );
 		assert(mask == 0xCAFEBABA);
 
@@ -43,5 +43,5 @@
 		// Park this thread,
 		assert(mask == (id_hash ^ 0xCAFEBABA));
-		park();
+		park( __cfaabi_dbg_ctx );
 		assert(mask == (id_hash ^ 0xCAFEBABA));