diff --git a/tools/thanos/thanos.cpp b/tools/thanos/thanos.cpp
index fc2e7cabc27d237eee3e7da997a8ff9d46c30b55..a5523b239d9bc8acb235532b6747c45ac9e095d3 100644
--- a/tools/thanos/thanos.cpp
+++ b/tools/thanos/thanos.cpp
@@ -296,8 +296,8 @@ int ThanosPlugin_t::runPlugin()
         cout<< "#ATTRIBUTE end_time="   << end_time_str   ; // endl in time_str
         cout<< "#ATTRIBUTE elapsed_time="  << elapsed_time<<endl;
         cout<< "#ATTRIBUTE step_name=" << step_name<<endl;
-        cout<< "#ATTRIBUTE step_command=  " << thanos_path << " " << step_name 
-	    << " --step-args "; copy(ALLOF(step_args), ostream_iterator<string>(cout, " ")); cout<<endl;
+        cout<< "#ATTRIBUTE step_command=  " << thanos_path << " \"" << step_name 
+	    << " --step-args "; copy(ALLOF(step_args), ostream_iterator<string>(cout, " ")); cout<<"\""<<endl;
         cout<< "#ATTRIBUTE step_exitcode="<<dec<<step_result<<endl;