0
@@ -139,7 +139,7 @@ module Kernel
0
   #   # This will now use the RSpec generator for tests
0
   #   $ ruby script/generate controller MyController
0
   def use_test(test_framework, *test_dependencies)
0
-    return unless Merb.env == "test" unless Merb.env.nil?
0
+    return unless Merb.env == "test" || Merb.env.nil?
0
     raise "use_test only supports :rspec and :test_unit currently" unless 
0
       [:rspec, :test_unit].include?(test_framework.to_sym)
0
     Merb.generator_scope.delete(:rspec)