diff --git a/packages/stokhos/test/UnitTest/Stokhos_KokkosArrayKernelsUnitTest_OpenMP.cpp b/packages/stokhos/test/UnitTest/Stokhos_KokkosArrayKernelsUnitTest_OpenMP.cpp
index 10dcc962727d..1358a0305a9d 100644
--- a/packages/stokhos/test/UnitTest/Stokhos_KokkosArrayKernelsUnitTest_OpenMP.cpp
+++ b/packages/stokhos/test/UnitTest/Stokhos_KokkosArrayKernelsUnitTest_OpenMP.cpp
@@ -81,19 +81,11 @@ TEUCHOS_UNIT_TEST( Kokkos_SG_SpMv, double_OpenMP_CrsMatrixFree_MKL ) {
 #endif
 
 int main( int argc, char* argv[] ) {
+  // Setup the MPI session
   Teuchos::GlobalMPISession mpiSession(&argc, &argv);
 
-  const size_t team_count =
-  Kokkos::hwloc::get_available_numa_count() *
-    Kokkos::hwloc::get_available_cores_per_numa();
-  const size_t threads_per_team =
-    Kokkos::hwloc::get_available_threads_per_core();
-
-  // Initialize openmp
-  Kokkos::InitializationSettings init_args;
-  init_args.set_num_threads(team_count*threads_per_team);
-  Kokkos::initialize( init_args );
-  //Kokkos::print_configuration( std::cout );
+  // Initialize Kokkos
+  Kokkos::initialize(argc, argv);
 
   // Setup (has to happen after initialization)
   setup.setup();
diff --git a/packages/stokhos/test/UnitTest/Stokhos_KokkosCrsMatrixMPVectorUnitTest_OpenMP.cpp b/packages/stokhos/test/UnitTest/Stokhos_KokkosCrsMatrixMPVectorUnitTest_OpenMP.cpp
index f7e7f226bd51..90744f4eb615 100644
--- a/packages/stokhos/test/UnitTest/Stokhos_KokkosCrsMatrixMPVectorUnitTest_OpenMP.cpp
+++ b/packages/stokhos/test/UnitTest/Stokhos_KokkosCrsMatrixMPVectorUnitTest_OpenMP.cpp
@@ -114,19 +114,11 @@ TEUCHOS_UNIT_TEST_TEMPLATE_2_DECL(
 CRS_MATRIX_MP_VECTOR_MULTIPLY_TESTS_ORDINAL_SCALAR_DEVICE(int, double, OpenMP)
 
 int main( int argc, char* argv[] ) {
+  // Setup the MPI session
   Teuchos::GlobalMPISession mpiSession(&argc, &argv);
 
-  // Initialize threads
-  num_cores =
-    Kokkos::hwloc::get_available_numa_count() *
-    Kokkos::hwloc::get_available_cores_per_numa();
-  num_hyper_threads =
-    Kokkos::hwloc::get_available_threads_per_core();
-
-  Kokkos::InitializationSettings init_args;
-  init_args.set_num_threads(num_cores*num_hyper_threads);
-  Kokkos::initialize( init_args );
-  //Kokkos::print_configuration(std::cout);
+  // Initialize Kokkos
+  Kokkos::initialize(argc, argv);
 
   // Run tests
   int ret = Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv);
diff --git a/packages/stokhos/test/UnitTest/Stokhos_KokkosCrsMatrixUQPCEUnitTest_OpenMP.cpp b/packages/stokhos/test/UnitTest/Stokhos_KokkosCrsMatrixUQPCEUnitTest_OpenMP.cpp
index 28a15d2e9cde..6cd991ee4c25 100644
--- a/packages/stokhos/test/UnitTest/Stokhos_KokkosCrsMatrixUQPCEUnitTest_OpenMP.cpp
+++ b/packages/stokhos/test/UnitTest/Stokhos_KokkosCrsMatrixUQPCEUnitTest_OpenMP.cpp
@@ -52,19 +52,11 @@ using Kokkos::OpenMP;
 CRSMATRIX_UQ_PCE_TESTS_DEVICE( OpenMP )
 
 int main( int argc, char* argv[] ) {
+  // Setup the MPI session
   Teuchos::GlobalMPISession mpiSession(&argc, &argv);
 
-  // Initialize threads
-  const size_t num_cores =
-    Kokkos::hwloc::get_available_numa_count() *
-    Kokkos::hwloc::get_available_cores_per_numa();
-  const size_t num_hyper_threads =
-    Kokkos::hwloc::get_available_threads_per_core();
-
-  Kokkos::InitializationSettings init_args;
-  init_args.set_num_threads(num_cores*num_hyper_threads);
-  Kokkos::initialize( init_args );
-  Kokkos::print_configuration(std::cout);
+  // Initialize Kokkos
+  Kokkos::initialize(argc, argv);
 
   // Run tests
   int ret = Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv);
diff --git a/packages/stokhos/test/UnitTest/Stokhos_KokkosViewFadMPVectorUnitTest_OpenMP.cpp b/packages/stokhos/test/UnitTest/Stokhos_KokkosViewFadMPVectorUnitTest_OpenMP.cpp
index 101d6965dc1e..b629774c026d 100644
--- a/packages/stokhos/test/UnitTest/Stokhos_KokkosViewFadMPVectorUnitTest_OpenMP.cpp
+++ b/packages/stokhos/test/UnitTest/Stokhos_KokkosViewFadMPVectorUnitTest_OpenMP.cpp
@@ -52,19 +52,11 @@ using Kokkos::OpenMP;
 VIEW_FAD_MP_VECTOR_TESTS_DEVICE( OpenMP )
 
 int main( int argc, char* argv[] ) {
+// Setup the MPI session
   Teuchos::GlobalMPISession mpiSession(&argc, &argv);
 
-  // Initialize threads
-  size_t num_cores =
-    Kokkos::hwloc::get_available_numa_count() *
-    Kokkos::hwloc::get_available_cores_per_numa();
-  size_t num_hyper_threads =
-    Kokkos::hwloc::get_available_threads_per_core();
-
-  Kokkos::InitializationSettings init_args;
-  init_args.set_num_threads(num_cores*num_hyper_threads);
-  Kokkos::initialize( init_args );
-  //Kokkos::print_configuration(std::cout);
+  // Initialize Kokkos
+  Kokkos::initialize(argc, argv);
 
   // Run tests
   int ret = Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv);
diff --git a/packages/stokhos/test/UnitTest/Stokhos_KokkosViewMPVectorUnitTest_OpenMP.cpp b/packages/stokhos/test/UnitTest/Stokhos_KokkosViewMPVectorUnitTest_OpenMP.cpp
index d0cce43ede2d..c206ec7dc18c 100644
--- a/packages/stokhos/test/UnitTest/Stokhos_KokkosViewMPVectorUnitTest_OpenMP.cpp
+++ b/packages/stokhos/test/UnitTest/Stokhos_KokkosViewMPVectorUnitTest_OpenMP.cpp
@@ -52,19 +52,11 @@ using Kokkos::OpenMP;
 VIEW_MP_VECTOR_TESTS_DEVICE( OpenMP )
 
 int main( int argc, char* argv[] ) {
+  // Setup the MPI session
   Teuchos::GlobalMPISession mpiSession(&argc, &argv);
 
-  // Initialize threads
-  size_t num_cores =
-    Kokkos::hwloc::get_available_numa_count() *
-    Kokkos::hwloc::get_available_cores_per_numa();
-  size_t num_hyper_threads =
-    Kokkos::hwloc::get_available_threads_per_core();
-
-  Kokkos::InitializationSettings init_args;
-  init_args.set_num_threads(num_cores*num_hyper_threads);
-  Kokkos::initialize( init_args );
-  //Kokkos::print_configuration(std::cout);
+  // Initialize Kokkos
+  Kokkos::initialize(argc, argv);
 
   // Run tests
   int ret = Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv);
diff --git a/packages/stokhos/test/UnitTest/Stokhos_KokkosViewUQPCEUnitTest_OpenMP.cpp b/packages/stokhos/test/UnitTest/Stokhos_KokkosViewUQPCEUnitTest_OpenMP.cpp
index 50e00e086f0e..cababd922cba 100644
--- a/packages/stokhos/test/UnitTest/Stokhos_KokkosViewUQPCEUnitTest_OpenMP.cpp
+++ b/packages/stokhos/test/UnitTest/Stokhos_KokkosViewUQPCEUnitTest_OpenMP.cpp
@@ -52,21 +52,11 @@ using Kokkos::OpenMP;
 VIEW_UQ_PCE_TESTS_DEVICE( OpenMP )
 
 int main( int argc, char* argv[] ) {
+// Setup the MPI session
   Teuchos::GlobalMPISession mpiSession(&argc, &argv);
 
-  // Initialize threads
-  const size_t num_cores =
-    Kokkos::hwloc::get_available_numa_count() *
-    Kokkos::hwloc::get_available_cores_per_numa();
-  const size_t num_hyper_threads =
-    Kokkos::hwloc::get_available_threads_per_core();
-  // const size_t num_cores = 1;
-  // const size_t num_hyper_threads = 1;
-
-  Kokkos::InitializationSettings init_args;
-  init_args.set_num_threads(num_cores*num_hyper_threads);
-  Kokkos::initialize( init_args );
-  //Kokkos::print_configuration(std::cout);
+  // Initialize Kokkos
+  Kokkos::initialize(argc, argv);
 
   // Run tests
   int ret = Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv);
diff --git a/packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixMPVectorUnitTest_OpenMP.cpp b/packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixMPVectorUnitTest_OpenMP.cpp
index 830e2615cfea..d274c3b0770c 100644
--- a/packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixMPVectorUnitTest_OpenMP.cpp
+++ b/packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixMPVectorUnitTest_OpenMP.cpp
@@ -53,22 +53,13 @@ typedef Tpetra::KokkosCompat::KokkosDeviceWrapperNode<Kokkos::OpenMP> OpenMPWrap
 CRSMATRIX_MP_VECTOR_TESTS_N( OpenMPWrapperNode )
 
 int main( int argc, char* argv[] ) {
+  // Setup the MPI session
   Teuchos::GlobalMPISession mpiSession(&argc, &argv);
 
   Kokkos::global_sacado_mp_vector_size = VectorSize;
 
-  // Initialize threads
-  const size_t num_cores =
-    Kokkos::hwloc::get_available_numa_count() *
-    Kokkos::hwloc::get_available_cores_per_numa();
-  const size_t num_hyper_threads =
-    Kokkos::hwloc::get_available_threads_per_core();
-  // const size_t num_cores = 1;
-  // const size_t num_hyper_threads = 1;
-  Kokkos::InitializationSettings init_args;
-  init_args.set_num_threads(num_cores*num_hyper_threads);
-  Kokkos::initialize( init_args );
-  //Kokkos::print_configuration(std::cout);
+  // Initialize Kokkos
+  Kokkos::initialize(argc, argv);
 
   // Run tests
   Teuchos::UnitTestRepository::setGloballyReduceTestResult(true);
diff --git a/packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixUQPCEUnitTest_OpenMP.cpp b/packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixUQPCEUnitTest_OpenMP.cpp
index 1cd3664efd43..dd8ee24ef052 100644
--- a/packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixUQPCEUnitTest_OpenMP.cpp
+++ b/packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixUQPCEUnitTest_OpenMP.cpp
@@ -53,20 +53,11 @@ typedef Tpetra::KokkosCompat::KokkosDeviceWrapperNode<Kokkos::OpenMP> OpenMPWrap
 CRSMATRIX_UQ_PCE_TESTS_N( OpenMPWrapperNode )
 
 int main( int argc, char* argv[] ) {
+// Setup the MPI session
   Teuchos::GlobalMPISession mpiSession(&argc, &argv);
 
-  // Initialize threads
-  const size_t num_cores =
-    Kokkos::hwloc::get_available_numa_count() *
-    Kokkos::hwloc::get_available_cores_per_numa();
-  const size_t num_hyper_threads =
-    Kokkos::hwloc::get_available_threads_per_core();
-  // const size_t num_cores = 1;
-  // const size_t num_hyper_threads = 1;
-  Kokkos::InitializationSettings init_args;
-  init_args.set_num_threads(num_cores*num_hyper_threads);
-  Kokkos::initialize( init_args );
-  //Kokkos::print_configuration(std::cout);
+  // Initialize Kokkos
+  Kokkos::initialize(argc, argv);
 
   // Run tests
   Teuchos::UnitTestRepository::setGloballyReduceTestResult(true);