Index: src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp
===================================================================
diff -u -N -rd99302fce795dbb5139659016a5da7948f141fb4 -rcb1a7688ad1ac1081a219c170754776e986ccc8c
--- src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp	(.../TReadBufferQueueWrapperTests.cpp)	(revision d99302fce795dbb5139659016a5da7948f141fb4)
+++ src/libchcore/Tests/TReadBufferQueueWrapperTests.cpp	(.../TReadBufferQueueWrapperTests.cpp)	(revision cb1a7688ad1ac1081a219c170754776e986ccc8c)
@@ -23,7 +23,7 @@
 	TSharedCountMTPtr<size_t> spReadAheadBufferCount(std::make_shared<TSharedCountMT<size_t>>());
 
 	TReadBufferQueueWrapper queue(spList, 0, 1024, 1, 1, spOtfBufferCount, spReadAheadBufferCount);
-	EXPECT_TIMEOUT(queue.GetHasBuffersEvent());
+	EXPECT_SIGNALED(queue.GetHasBuffersEvent());
 	EXPECT_EQ(false, queue.IsDataSourceFinished());
 }
 
@@ -112,8 +112,9 @@
 	EXPECT_EQ(3072, buffer1.GetFilePosition());
 	EXPECT_EQ(1024, buffer1.GetRequestedDataSize());
 
-	EXPECT_TIMEOUT(queue.GetHasBuffersEvent());
+	EXPECT_SIGNALED(queue.GetHasBuffersEvent());
 	EXPECT_EQ(nullptr, queue.Pop());
+	EXPECT_TIMEOUT(queue.GetHasBuffersEvent());
 }
 
 TEST(TReadBufferQueueWrapperTests, PushPop_MixedBuffers)
@@ -154,8 +155,9 @@
 	EXPECT_EQ(3072, buffer1.GetFilePosition());
 	EXPECT_EQ(1024, buffer1.GetRequestedDataSize());
 
-	EXPECT_TIMEOUT(queue.GetHasBuffersEvent());
+	EXPECT_SIGNALED(queue.GetHasBuffersEvent());
 	EXPECT_EQ(nullptr, queue.Pop());
+	EXPECT_TIMEOUT(queue.GetHasBuffersEvent());
 }
 
 /////////////////////////////////////////////////////////////////////////////////