diff --git a/features/support/demo_app.rb b/features/support/demo_app.rb
index <HASH>..<HASH> 100644
--- a/features/support/demo_app.rb
+++ b/features/support/demo_app.rb
@@ -13,7 +13,7 @@ class DemoApp
   end
 
   def teardown
-    [@app, @test_app].each do |app|
+    all_apks do |app|
       puts "Removing #{app[:package]}..."
       uninstall app[:package]
     end
@@ -21,7 +21,7 @@ class DemoApp
 
   private
   def install_app
-    [@app, @test_app].each do |app|
+    all_apks do |app|
       puts "Installing #{app[:apk]}..."
       install app[:apk]
     end
@@ -34,6 +34,12 @@ class DemoApp
     forward local, host
   end
 
+  def all_apks(&block)
+    [@app, @test_app].each do |app|
+      block.call app
+    end
+  end
+
   def start
     shell "am instrument -e packageName #{@app[:package]} -e fullLauncherName #{@app[:package]}.ApiDemos -e class com.leandog.gametel.driver.TheTest #{@test_app[:package]}/com.leandog.gametel.driver.GametelInstrumentation"
     sleep 2
refactor apks.each into block call