diff --git a/features/manager/unmanage.feature b/features/manager/unmanage.feature
index 04aa073..d8be9f3 100644
--- a/features/manager/unmanage.feature
+++ b/features/manager/unmanage.feature
@@ -2,7 +2,7 @@ Feature: manager client unmanagement
 
   Background:
     Given uhwm is running
-    And a window is mapped
+    And a window is managed
 
   Scenario: logs when a new client is unmanaged
     When the window requests to be unmapped
diff --git a/features/steps/x_steps.rb b/features/steps/x_steps.rb
index ca19392..f8cacf1 100644
--- a/features/steps/x_steps.rb
+++ b/features/steps/x_steps.rb
@@ -1,11 +1,12 @@
-Given /^a window is mapped$/ do
-  x_window_map
-end
-
 Given /^a (\w+) window is mapped$/ do |ident|
   x_window_map ident: ident
 end
 
+Given /^a window is managed$/ do
+  x_window_map
+  uhwm_wait_output /manag.+#{x_window_name}/i
+end
+
 When /^I press the ([^ ]+) keys?$/ do |keys|
   x_key keys
 end