diff --git a/ophyd/tests/test_areadetector.py b/ophyd/tests/test_areadetector.py
index a27d94756..74830eb7d 100644
--- a/ophyd/tests/test_areadetector.py
+++ b/ophyd/tests/test_areadetector.py
@@ -437,11 +437,14 @@ class MyDetector(SingleTrigger, SimDetector):
 
     det.stage()
     st = det.trigger()
-    while not st.done:
-        time.sleep(.1)
+    st.wait()
     reading = det.read()
+    doc_count = 0
     for name, d in det.collect_asset_docs():
+        doc_count += 1
         getattr(fs2, 'insert_{name}'.format(name=name))(**d)
+    assert doc_count > 0
+
     det.describe()
     det.unstage()