diff --git a/features/actions/quit.feature b/features/actions/quit.feature
deleted file mode 100644
index 60a2e57..0000000
--- a/features/actions/quit.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: quit action
-
-  Scenario: quits on alt+q keys press
-    Given uhwm is running
-    When I press the alt+q keys
-    Then uhwm should terminate successfully
diff --git a/features/x/connection.feature b/features/session/connection.feature
similarity index 100%
rename from features/x/connection.feature
rename to features/session/connection.feature
diff --git a/features/session/termination.feature b/features/session/termination.feature
new file mode 100644
index 0000000..6cdd522
--- /dev/null
+++ b/features/session/termination.feature
@@ -0,0 +1,6 @@
+Feature: program termination
+
+  Scenario: terminates when requested to quit
+    Given uhwm is running
+    When I tell uhwm to quit
+    Then uhwm should terminate successfully
diff --git a/features/steps/run_steps.rb b/features/steps/run_steps.rb
index 5e25604..e8f9026 100644
--- a/features/steps/run_steps.rb
+++ b/features/steps/run_steps.rb
@@ -19,6 +19,10 @@ When /^I run uhwm with options? (-.+)$/ do |options|
   uhwm_run options
 end
 
+When /^I tell uhwm to quit$/ do
+  x_key 'alt+q'
+end
+
 Then /^the exit status must be (\d+)$/ do |exit_status|
   assert_exit_status exit_status.to_i
 end