diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
index c2567ff46fe..b7b4ae3407a 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
@@ -40,10 +40,10 @@ class JfrDCmd : public DCmd {
   void print_java_help(const char* help_method) const;
  public:
   void execute(DCmdSource source, const JcmdOptions& commonOptions, TRAPS) override;
-  virtual void print_help(const char* name) const;
-  virtual GrowableArray<const char*>* argument_name_array() const;
-  virtual GrowableArray<DCmdArgumentInfo*>* argument_info_array() const;
-  virtual void parse(CmdLine* line, char delim, TRAPS);
+  void print_help(const char* name) const override;
+  GrowableArray<const char*>* argument_name_array() const override;
+  GrowableArray<DCmdArgumentInfo*>* argument_info_array() const override;
+  void parse(CmdLine* line, char delim, TRAPS) override;
 };
 
 class JfrStartFlightRecordingDCmd : public JfrDCmd {
@@ -203,7 +203,7 @@ class JfrConfigureFlightRecorderDCmd : public DCmdWithParser {
   }
   static int num_arguments() { return 10; }
   void execute(DCmdSource source, const JcmdOptions& commonOptions, TRAPS) override;
-  virtual void print_help(const char* name) const;
+  void print_help(const char* name) const override;
 };
 
 
diff --git a/src/hotspot/share/services/diagnosticFramework.hpp b/src/hotspot/share/services/diagnosticFramework.hpp
index 6f842c51d1e..ea8b981fb60 100644
--- a/src/hotspot/share/services/diagnosticFramework.hpp
+++ b/src/hotspot/share/services/diagnosticFramework.hpp
@@ -168,8 +168,7 @@ public:
 struct JcmdOptions {
   enum class TimeStamp {
     Default,
-    Yes,
-    No
+    Yes
   };
 
   TimeStamp timestamp;
@@ -316,13 +315,13 @@ public:
   DCmdWithParser (outputStream *output, bool heap=false) : DCmd(output, heap) { }
   static const char* disabled_message() { return "Diagnostic command currently disabled"; }
   static const char* impact()         { return "Low: No impact"; }
-  virtual void parse(CmdLine *line, char delim, TRAPS);
+  void parse(CmdLine *line, char delim, TRAPS) override;
   void execute(DCmdSource source, const JcmdOptions& commonOptions, TRAPS) override { }
-  virtual void reset(TRAPS);
-  virtual void cleanup();
-  virtual void print_help(const char* name) const;
-  virtual GrowableArray<const char*>* argument_name_array() const;
-  virtual GrowableArray<DCmdArgumentInfo*>* argument_info_array() const;
+  void reset(TRAPS) override;
+  void cleanup() override;
+  void print_help(const char* name) const override;
+  GrowableArray<const char*>* argument_name_array() const override;
+  GrowableArray<DCmdArgumentInfo*>* argument_info_array() const override;
   DCmdParser* dcmdparser() {
     return &_dcmdparser;
   }