diff --git a/tests/hierarchy_driver.cc b/tests/hierarchy_driver.cc
index 50ba4c24..8fad7d28 100644
--- a/tests/hierarchy_driver.cc
+++ b/tests/hierarchy_driver.cc
@@ -174,8 +174,7 @@ int main(int argc, char *argv[])
 {
   namespace boost_po = boost::program_options;
 
-  MPI_Init(&argc, &argv);
-  dealii::MultithreadInfo::set_thread_limit(1);
+  dealii::Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv);
 
   boost_po::options_description cmd("Available options");
   cmd.add_options()("help,h", "produce help message");
@@ -369,7 +368,5 @@ int main(int argc, char *argv[])
       matrix_based_two_grids<3>(params);
   }
 
-  MPI_Finalize();
-
   return 0;
 }