diff --git a/Rakefile b/Rakefile
index 6c160a5ed..533153290 100644
--- a/Rakefile
+++ b/Rakefile
@@ -123,20 +123,21 @@ end
 desc "run all mruby tests"
 task :test
 MRuby.each_target do
-  next unless test_enabled?
-
-  t = :"test_#{self.name}"
-  task t => ["all"] do
-    run_test
+  if test_enabled?
+    t = :"test_#{self.name}"
+    task t => ["all"] do
+      run_test
+    end
+    task :test => t
   end
-  task :test => t
 
-  next unless bintest_enabled?
-  t = :"bintest_#{self.name}"
-  task t => ["all"] do
-    run_bintest
+  if bintest_enabled?
+    t = :"bintest_#{self.name}"
+    task t => ["all"] do
+      run_bintest
+    end
+    task :test => t
   end
-  task :test => t
 end
 
 desc "clean all built and in-repo installed artifacts"
diff --git a/lib/mruby/gem.rb b/lib/mruby/gem.rb
index 33396803a..ce2e01ab1 100644
--- a/lib/mruby/gem.rb
+++ b/lib/mruby/gem.rb
@@ -112,7 +112,7 @@ module MRuby
       end
 
       def add_test_dependency(*args)
-        add_dependency(*args) if build.test_enabled?
+        add_dependency(*args) if build.test_enabled? || build.bintest_enabled?
       end
 
       def add_conflict(name, *req)