diff --git a/padrino-gen/lib/padrino-gen/generators/components/mocks/rr_gen.rb b/padrino-gen/lib/padrino-gen/generators/components/mocks/rr_gen.rb
index 593729af3..7cb0e26b1 100644
--- a/padrino-gen/lib/padrino-gen/generators/components/mocks/rr_gen.rb
+++ b/padrino-gen/lib/padrino-gen/generators/components/mocks/rr_gen.rb
@@ -2,15 +2,19 @@ module Padrino
   module Generators
     module Components
       module Mocks
-        
+
         module RrGen
           def setup_mock
             require_dependencies 'rr', :group => 'test'
-            insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
+            if options[:test] == 'riot'
+              inject_into_file "test/test_config.rb","  Riot.rr\n", :after => "class Riot::Situation\n"
+            else
+              insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
+            end
           end
         end
-        
+
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/padrino-gen/test/test_app_generator.rb b/padrino-gen/test/test_app_generator.rb
index 487e21afa..a67c193e3 100644
--- a/padrino-gen/test/test_app_generator.rb
+++ b/padrino-gen/test/test_app_generator.rb
@@ -81,7 +81,7 @@ def setup
       buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--mock=rr', '--script=none']) }
       assert_match /Applying.*?rr.*?mock/, buffer
       assert_match_in_file(/gem 'rr'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/include RR::Adapters::RRMethods/m, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/Riot.rr/m, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate default for mocha" do