diff --git a/tool/speed.cc b/tool/speed.cc
index 11264a0e56..3c67795c9d 100644
--- a/tool/speed.cc
+++ b/tool/speed.cc
@@ -417,8 +417,7 @@ static bool SpeedRSA(const std::string &selected) {
 }
 
 static bool SpeedRSAKeyGen(bool is_fips, const std::string &selected) {
-  // Don't run this by default because it's so slow.
-  if (selected != "RSAKeyGen") {
+  if (!selected.empty() && selected.find("RSAKeyGen") == std::string::npos) {
     return true;
   }