diff --git a/src/tools/ompi_info/ompi_info.cc b/src/tools/ompi_info/ompi_info.cc
index a453527c87..1d5344927f 100644
--- a/src/tools/ompi_info/ompi_info.cc
+++ b/src/tools/ompi_info/ompi_info.cc
@@ -34,6 +34,7 @@
 #endif
 #include <errno.h>
 
+#include "class/ompi_object.h"
 #include "runtime/runtime.h"
 #include "util/output.h"
 #include "util/cmd_line.h"
@@ -209,5 +210,7 @@ int main(int argc, char *argv[])
 
   ompi_info::close_components();
   OBJ_RELEASE(cmd_line);
+  mca_base_close();
+  ompi_class_finalize();
   return 0;
 }