diff --git a/.index b/.index
index 6f37098..aff24f2 100644
--- a/.index
+++ b/.index
@@ -10,7 +10,7 @@ copyrights:
   year: '2009'
   license: BSD-2-Clause
 requirements:
-- name: rubytest
+- name: rubytest-cli
 - name: ae
 - name: ansi
   version: 1.3+
diff --git a/Indexfile b/Indexfile
index a89d690..dba5fb5 100644
--- a/Indexfile
+++ b/Indexfile
@@ -15,7 +15,7 @@ resources:
   bugs: http://github.com/rubyworks/lemon/issues
 
 requirements:
-  - rubytest
+  - rubytest-cli
   - ae
   - ansi 1.3+
   - detroit  (build)
diff --git a/lib/lemon/cli.rb b/lib/lemon/cli.rb
index 708f26e..f1695bb 100644
--- a/lib/lemon/cli.rb
+++ b/lib/lemon/cli.rb
@@ -24,8 +24,8 @@ def self.cli(*argv)
     case cmd
     when 't', 'test', 'run'
       require 'lemon'
-      require 'rubytest'
-      Test::Runner.cli(*ARGV)
+      require 'rubytest-cli'
+      Test::CLI.new(ARGV)
       #Lemon::CLI::Test.new.run(argv)
     when 'g', 'gen', 'generate', 'generator'
       Lemon::CLI::Generate.run(argv)