diff --git a/core/test/base/array.cpp b/core/test/base/array.cpp
index 23515d70fc4..f7e03855d06 100644
--- a/core/test/base/array.cpp
+++ b/core/test/base/array.cpp
@@ -40,8 +40,7 @@ class Array : public ::testing::Test {
     gko::array<T> x;
 };
 
-TYPED_TEST_SUITE(Array, gko::test::ComplexAndPODTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Array, gko::test::ComplexAndPODTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Array, CanBeCreatedWithoutAnExecutor)
diff --git a/core/test/base/batch_multi_vector.cpp b/core/test/base/batch_multi_vector.cpp
index 7a9606bc710..3798f30ce65 100644
--- a/core/test/base/batch_multi_vector.cpp
+++ b/core/test/base/batch_multi_vector.cpp
@@ -64,8 +64,7 @@ class MultiVector : public ::testing::Test {
     std::unique_ptr<gko::matrix::Dense<value_type>> dense_mtx;
 };
 
-TYPED_TEST_SUITE(MultiVector, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(MultiVector, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(MultiVector, CanBeEmpty)
diff --git a/core/test/base/combination.cpp b/core/test/base/combination.cpp
index 63c73cfa168..73c30ffe11c 100644
--- a/core/test/base/combination.cpp
+++ b/core/test/base/combination.cpp
@@ -43,8 +43,7 @@ class Combination : public ::testing::Test {
     std::vector<std::shared_ptr<gko::LinOp>> coefficients;
 };
 
-TYPED_TEST_SUITE(Combination, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Combination, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Combination, CanBeEmpty)
diff --git a/core/test/base/composition.cpp b/core/test/base/composition.cpp
index 58c86894fc8..122755b8f92 100644
--- a/core/test/base/composition.cpp
+++ b/core/test/base/composition.cpp
@@ -41,8 +41,7 @@ class Composition : public ::testing::Test {
     std::vector<std::shared_ptr<gko::LinOp>> operators;
 };
 
-TYPED_TEST_SUITE(Composition, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Composition, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Composition, CanBeEmpty)
diff --git a/core/test/base/dense_cache.cpp b/core/test/base/dense_cache.cpp
index 54d904617db..526187610a4 100644
--- a/core/test/base/dense_cache.cpp
+++ b/core/test/base/dense_cache.cpp
@@ -31,8 +31,7 @@ class DenseCache : public ::testing::Test {
 };
 
 
-TYPED_TEST_SUITE(DenseCache, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(DenseCache, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(DenseCache, CanDefaultConstruct)
diff --git a/core/test/base/iterator_factory.cpp b/core/test/base/iterator_factory.cpp
index 3685242f78a..bbc3bbfd04f 100644
--- a/core/test/base/iterator_factory.cpp
+++ b/core/test/base/iterator_factory.cpp
@@ -78,7 +78,7 @@ class ZipIterator : public ::testing::Test {
     const std::vector<value_type> ordered_value;
 };
 
-TYPED_TEST_SUITE(ZipIterator, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(ZipIterator, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
@@ -366,7 +366,7 @@ class PermuteIterator : public ::testing::Test {
     using value_type = ValueType;
 };
 
-TYPED_TEST_SUITE(PermuteIterator, gko::test::ComplexAndPODTypesWithHalf,
+TYPED_TEST_SUITE(PermuteIterator, gko::test::ComplexAndPODTypes,
                  TypenameNameGenerator);
 
 
diff --git a/core/test/base/mtx_io.cpp b/core/test/base/mtx_io.cpp
index 14d44335b85..f800f4e40f2 100644
--- a/core/test/base/mtx_io.cpp
+++ b/core/test/base/mtx_io.cpp
@@ -973,7 +973,7 @@ class RealDummyLinOpTest : public ::testing::Test {
         typename std::tuple_element<1, decltype(ValueIndexType())>::type;
 };
 
-TYPED_TEST_SUITE(RealDummyLinOpTest, gko::test::RealValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(RealDummyLinOpTest, gko::test::RealValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
@@ -1178,7 +1178,7 @@ class DenseTest : public ::testing::Test {
     using index_type = typename std::tuple_element<1, ValueIndexType>::type;
 };
 
-TYPED_TEST_SUITE(DenseTest, gko::test::RealValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(DenseTest, gko::test::RealValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
@@ -1222,8 +1222,7 @@ class ComplexDummyLinOpTest : public ::testing::Test {
         typename std::tuple_element<1, decltype(ValueIndexType())>::type;
 };
 
-TYPED_TEST_SUITE(ComplexDummyLinOpTest,
-                 gko::test::ComplexValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(ComplexDummyLinOpTest, gko::test::ComplexValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/base/segmented_array.cpp b/core/test/base/segmented_array.cpp
index 31444d71d18..2741990036f 100644
--- a/core/test/base/segmented_array.cpp
+++ b/core/test/base/segmented_array.cpp
@@ -27,8 +27,7 @@ class SegmentedArray : public ::testing::Test {
     std::shared_ptr<gko::Executor> exec = gko::ReferenceExecutor::create();
 };
 
-TYPED_TEST_SUITE(SegmentedArray, gko::test::PODTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(SegmentedArray, gko::test::PODTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(SegmentedArray, CanConstructFromExecutor)
diff --git a/core/test/components/addressable_pq.cpp b/core/test/components/addressable_pq.cpp
index 87fcb289a77..6301cd44fb4 100644
--- a/core/test/components/addressable_pq.cpp
+++ b/core/test/components/addressable_pq.cpp
@@ -91,8 +91,8 @@ class AddressablePriorityQueue : public ::testing::Test {
     std::shared_ptr<const gko::Executor> exec;
 };
 
-TYPED_TEST_SUITE(AddressablePriorityQueue,
-                 gko::test::RealValueIndexTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(AddressablePriorityQueue, gko::test::RealValueIndexTypes,
+                 TypenameNameGenerator);
 
 
 TYPED_TEST(AddressablePriorityQueue, InitializesCorrectly)
diff --git a/core/test/factorization/elimination_forest.cpp b/core/test/factorization/elimination_forest.cpp
index cf9ddb7536e..292b366f50e 100644
--- a/core/test/factorization/elimination_forest.cpp
+++ b/core/test/factorization/elimination_forest.cpp
@@ -33,7 +33,7 @@ class EliminationForest : public ::testing::Test {
     std::shared_ptr<const gko::ReferenceExecutor> ref;
 };
 
-TYPED_TEST_SUITE(EliminationForest, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(EliminationForest, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/factorization/par_ic.cpp b/core/test/factorization/par_ic.cpp
index efd4c1e3ebd..d6de0f9fc98 100644
--- a/core/test/factorization/par_ic.cpp
+++ b/core/test/factorization/par_ic.cpp
@@ -29,8 +29,7 @@ class ParIc : public ::testing::Test {
     std::shared_ptr<const gko::ReferenceExecutor> ref;
 };
 
-TYPED_TEST_SUITE(ParIc, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIc, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIc, SetIterations)
diff --git a/core/test/factorization/par_ict.cpp b/core/test/factorization/par_ict.cpp
index 5d5ac8bc815..07eec8db549 100644
--- a/core/test/factorization/par_ict.cpp
+++ b/core/test/factorization/par_ict.cpp
@@ -29,8 +29,7 @@ class ParIct : public ::testing::Test {
     std::shared_ptr<const gko::ReferenceExecutor> ref;
 };
 
-TYPED_TEST_SUITE(ParIct, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIct, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIct, SetIterations)
diff --git a/core/test/factorization/par_ilu.cpp b/core/test/factorization/par_ilu.cpp
index e06a90741af..a0b8f37e3d4 100644
--- a/core/test/factorization/par_ilu.cpp
+++ b/core/test/factorization/par_ilu.cpp
@@ -29,8 +29,7 @@ class ParIlu : public ::testing::Test {
     std::shared_ptr<const gko::ReferenceExecutor> ref;
 };
 
-TYPED_TEST_SUITE(ParIlu, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIlu, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIlu, SetIterations)
diff --git a/core/test/factorization/par_ilut.cpp b/core/test/factorization/par_ilut.cpp
index a2d0287d22a..ad466e62407 100644
--- a/core/test/factorization/par_ilut.cpp
+++ b/core/test/factorization/par_ilut.cpp
@@ -30,7 +30,7 @@ class ParIlut : public ::testing::Test {
     std::shared_ptr<const gko::ReferenceExecutor> ref;
 };
 
-TYPED_TEST_SUITE(ParIlut, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(ParIlut, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/log/convergence.cpp b/core/test/log/convergence.cpp
index 64ec37e8942..8fff0c17b8e 100644
--- a/core/test/log/convergence.cpp
+++ b/core/test/log/convergence.cpp
@@ -45,8 +45,7 @@ class Convergence : public ::testing::Test {
     gko::array<gko::stopping_status> status = {exec, 1};
 };
 
-TYPED_TEST_SUITE(Convergence, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Convergence, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Convergence, CanGetEmptyData)
diff --git a/core/test/log/papi.cpp b/core/test/log/papi.cpp
index e0404b04d90..8278120cc49 100644
--- a/core/test/log/papi.cpp
+++ b/core/test/log/papi.cpp
@@ -91,7 +91,7 @@ class Papi : public ::testing::Test {
     int eventset;
 };
 
-TYPED_TEST_SUITE(Papi, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Papi, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Papi, CatchesAllocationStarted)
diff --git a/core/test/log/solver_progress.cpp b/core/test/log/solver_progress.cpp
index 2b4a6ac599c..e00044a908d 100644
--- a/core/test/log/solver_progress.cpp
+++ b/core/test/log/solver_progress.cpp
@@ -68,8 +68,7 @@ class SolverProgress : public ::testing::Test {
     std::unique_ptr<Cg> solver;
 };
 
-TYPED_TEST_SUITE(SolverProgress, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(SolverProgress, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(SolverProgress, TableWorks)
diff --git a/core/test/log/stream.cpp b/core/test/log/stream.cpp
index 7f4b41e5cc3..1ad02f7daf1 100644
--- a/core/test/log/stream.cpp
+++ b/core/test/log/stream.cpp
@@ -26,7 +26,7 @@ constexpr int num_iters = 10;
 template <typename T>
 class Stream : public ::testing::Test {};
 
-TYPED_TEST_SUITE(Stream, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Stream, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Stream, CatchesAllocationStarted)
diff --git a/core/test/matrix/batch_csr.cpp b/core/test/matrix/batch_csr.cpp
index 3a1871ba583..57cae53d646 100644
--- a/core/test/matrix/batch_csr.cpp
+++ b/core/test/matrix/batch_csr.cpp
@@ -114,7 +114,7 @@ class Csr : public ::testing::Test {
     std::unique_ptr<CsrMtx> sp_csr_mtx;
 };
 
-TYPED_TEST_SUITE(Csr, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Csr, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Csr, KnowsItsSizeAndValues)
diff --git a/core/test/matrix/batch_dense.cpp b/core/test/matrix/batch_dense.cpp
index 23542114746..334df5c0e93 100644
--- a/core/test/matrix/batch_dense.cpp
+++ b/core/test/matrix/batch_dense.cpp
@@ -68,7 +68,7 @@ class Dense : public ::testing::Test {
     std::unique_ptr<gko::matrix::Dense<value_type>> dense_mtx;
 };
 
-TYPED_TEST_SUITE(Dense, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Dense, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Dense, KnowsItsSizeAndValues)
diff --git a/core/test/matrix/batch_ell.cpp b/core/test/matrix/batch_ell.cpp
index ae047ecfa90..11f6381a43d 100644
--- a/core/test/matrix/batch_ell.cpp
+++ b/core/test/matrix/batch_ell.cpp
@@ -92,7 +92,7 @@ class Ell : public ::testing::Test {
     std::unique_ptr<EllMtx> sp_ell_mtx;
 };
 
-TYPED_TEST_SUITE(Ell, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Ell, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Ell, KnowsItsSizeAndValues)
diff --git a/core/test/matrix/batch_identity.cpp b/core/test/matrix/batch_identity.cpp
index 765f9f30938..dd7a3675110 100644
--- a/core/test/matrix/batch_identity.cpp
+++ b/core/test/matrix/batch_identity.cpp
@@ -49,8 +49,7 @@ class Identity : public ::testing::Test {
     std::unique_ptr<gko::batch::MultiVector<value_type>> mvec;
 };
 
-TYPED_TEST_SUITE(Identity, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Identity, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Identity, KnowsItsSizeAndValues)
diff --git a/core/test/matrix/coo.cpp b/core/test/matrix/coo.cpp
index 56735e792d5..ffb8d5aee9f 100644
--- a/core/test/matrix/coo.cpp
+++ b/core/test/matrix/coo.cpp
@@ -77,8 +77,7 @@ class Coo : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Coo, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Coo, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Coo, KnowsItsSize)
diff --git a/core/test/matrix/coo_builder.cpp b/core/test/matrix/coo_builder.cpp
index b1b22c5848a..9bfae5cf3af 100644
--- a/core/test/matrix/coo_builder.cpp
+++ b/core/test/matrix/coo_builder.cpp
@@ -32,7 +32,7 @@ class CooBuilder : public ::testing::Test {
     std::unique_ptr<Mtx> mtx;
 };
 
-TYPED_TEST_SUITE(CooBuilder, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(CooBuilder, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/matrix/csr.cpp b/core/test/matrix/csr.cpp
index f199de423e8..4bbdc63851a 100644
--- a/core/test/matrix/csr.cpp
+++ b/core/test/matrix/csr.cpp
@@ -82,8 +82,7 @@ class Csr : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Csr, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Csr, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Csr, KnowsItsSize)
diff --git a/core/test/matrix/csr_builder.cpp b/core/test/matrix/csr_builder.cpp
index 2accb57770c..24cbe4718c5 100644
--- a/core/test/matrix/csr_builder.cpp
+++ b/core/test/matrix/csr_builder.cpp
@@ -33,7 +33,7 @@ class CsrBuilder : public ::testing::Test {
     std::unique_ptr<Mtx> mtx;
 };
 
-TYPED_TEST_SUITE(CsrBuilder, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(CsrBuilder, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/matrix/dense.cpp b/core/test/matrix/dense.cpp
index f1a673840ea..e7158a15aed 100644
--- a/core/test/matrix/dense.cpp
+++ b/core/test/matrix/dense.cpp
@@ -48,7 +48,7 @@ class Dense : public ::testing::Test {
     std::unique_ptr<gko::matrix::Dense<value_type>> mtx;
 };
 
-TYPED_TEST_SUITE(Dense, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Dense, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Dense, CanBeEmpty)
diff --git a/core/test/matrix/diagonal.cpp b/core/test/matrix/diagonal.cpp
index 7e598d67a5e..de03a9350bb 100644
--- a/core/test/matrix/diagonal.cpp
+++ b/core/test/matrix/diagonal.cpp
@@ -47,8 +47,7 @@ class Diagonal : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Diagonal, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Diagonal, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Diagonal, KnowsItsSize)
diff --git a/core/test/matrix/ell.cpp b/core/test/matrix/ell.cpp
index 93fc73dde18..bcc2b591a50 100644
--- a/core/test/matrix/ell.cpp
+++ b/core/test/matrix/ell.cpp
@@ -79,8 +79,7 @@ class Ell : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Ell, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Ell, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Ell, KnowsItsSize)
diff --git a/core/test/matrix/fbcsr.cpp b/core/test/matrix/fbcsr.cpp
index fd024532a14..3d3d4ee738d 100644
--- a/core/test/matrix/fbcsr.cpp
+++ b/core/test/matrix/fbcsr.cpp
@@ -131,7 +131,7 @@ class FbcsrSample : public ::testing::Test {
 };
 
 
-TYPED_TEST_SUITE(FbcsrSample, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(FbcsrSample, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
@@ -183,7 +183,7 @@ template <typename ValueIndexType>
 class FbcsrSampleComplex : public FbcsrSample<ValueIndexType> {};
 
 
-TYPED_TEST_SUITE(FbcsrSampleComplex, gko::test::ComplexValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(FbcsrSampleComplex, gko::test::ComplexValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
@@ -282,8 +282,7 @@ class Fbcsr : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Fbcsr, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Fbcsr, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Fbcsr, GetNumBlocksCorrectlyThrows)
diff --git a/core/test/matrix/fbcsr_builder.cpp b/core/test/matrix/fbcsr_builder.cpp
index 241c7ccc6eb..d91a0c7b70a 100644
--- a/core/test/matrix/fbcsr_builder.cpp
+++ b/core/test/matrix/fbcsr_builder.cpp
@@ -33,7 +33,7 @@ class FbcsrBuilder : public ::testing::Test {
     std::unique_ptr<Mtx> mtx;
 };
 
-TYPED_TEST_SUITE(FbcsrBuilder, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(FbcsrBuilder, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/matrix/hybrid.cpp b/core/test/matrix/hybrid.cpp
index 6b1e2a4a747..d1a69312755 100644
--- a/core/test/matrix/hybrid.cpp
+++ b/core/test/matrix/hybrid.cpp
@@ -96,8 +96,7 @@ class Hybrid : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Hybrid, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Hybrid, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Hybrid, KnowsItsSize)
diff --git a/core/test/matrix/identity.cpp b/core/test/matrix/identity.cpp
index 80defae4441..bcf9c036992 100644
--- a/core/test/matrix/identity.cpp
+++ b/core/test/matrix/identity.cpp
@@ -31,8 +31,7 @@ class Identity : public ::testing::Test {
     std::shared_ptr<const gko::Executor> exec;
 };
 
-TYPED_TEST_SUITE(Identity, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Identity, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Identity, CanBeEmpty)
@@ -82,8 +81,7 @@ class IdentityFactory : public ::testing::Test {
     using value_type = T;
 };
 
-TYPED_TEST_SUITE(IdentityFactory, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(IdentityFactory, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(IdentityFactory, CanGenerateIdentityMatrix)
diff --git a/core/test/matrix/permutation.cpp b/core/test/matrix/permutation.cpp
index fcd5aad789c..edb1532696b 100644
--- a/core/test/matrix/permutation.cpp
+++ b/core/test/matrix/permutation.cpp
@@ -52,7 +52,7 @@ class Permutation : public ::testing::Test {
     std::unique_ptr<gko::matrix::Permutation<index_type>> mtx;
 };
 
-TYPED_TEST_SUITE(Permutation, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(Permutation, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/matrix/row_gatherer.cpp b/core/test/matrix/row_gatherer.cpp
index b808828cc08..46a09b808fc 100644
--- a/core/test/matrix/row_gatherer.cpp
+++ b/core/test/matrix/row_gatherer.cpp
@@ -65,7 +65,7 @@ class RowGatherer : public ::testing::Test {
     std::unique_ptr<OutVec> out;
 };
 
-TYPED_TEST_SUITE(RowGatherer, gko::test::TwoValueIndexTypeWithHalf,
+TYPED_TEST_SUITE(RowGatherer, gko::test::TwoValueIndexTypes,
                  TupleTypenameNameGenerator);
 
 
diff --git a/core/test/matrix/sellp.cpp b/core/test/matrix/sellp.cpp
index a79fcf2bbd3..123d7bae773 100644
--- a/core/test/matrix/sellp.cpp
+++ b/core/test/matrix/sellp.cpp
@@ -107,8 +107,7 @@ class Sellp : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Sellp, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Sellp, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Sellp, KnowsItsSize)
diff --git a/core/test/matrix/sparsity_csr.cpp b/core/test/matrix/sparsity_csr.cpp
index 67f8237adb6..e929f960f1e 100644
--- a/core/test/matrix/sparsity_csr.cpp
+++ b/core/test/matrix/sparsity_csr.cpp
@@ -74,7 +74,7 @@ class SparsityCsr : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(SparsityCsr, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(SparsityCsr, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/mpi/base/bindings.cpp b/core/test/mpi/base/bindings.cpp
index ddcbb1777df..9feebb76ca9 100644
--- a/core/test/mpi/base/bindings.cpp
+++ b/core/test/mpi/base/bindings.cpp
@@ -24,7 +24,7 @@ class MpiBindings : public ::testing::Test {
     std::shared_ptr<gko::Executor> ref;
 };
 
-using TestTypes = gko::test::merge_type_list_t<gko::test::RealValueTypes,
+using TestTypes = gko::test::merge_type_list_t<gko::test::RealValueTypesBase,
                                                gko::test::IndexTypes>;
 
 TYPED_TEST_SUITE(MpiBindings, TestTypes, TypenameNameGenerator);
diff --git a/core/test/mpi/distributed/matrix.cpp b/core/test/mpi/distributed/matrix.cpp
index 2b027face11..26a551b5758 100644
--- a/core/test/mpi/distributed/matrix.cpp
+++ b/core/test/mpi/distributed/matrix.cpp
@@ -177,7 +177,7 @@ class MatrixBuilder : public ::testing::Test {
     gko::experimental::mpi::communicator comm;
 };
 
-TYPED_TEST_SUITE(MatrixBuilder, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(MatrixBuilder, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/core/test/mpi/distributed/preconditioner/schwarz.cpp b/core/test/mpi/distributed/preconditioner/schwarz.cpp
index fb6676cc011..b55ec6a80ce 100644
--- a/core/test/mpi/distributed/preconditioner/schwarz.cpp
+++ b/core/test/mpi/distributed/preconditioner/schwarz.cpp
@@ -65,7 +65,7 @@ class SchwarzFactory : public ::testing::Test {
     std::shared_ptr<Mtx> mtx;
 };
 
-TYPED_TEST_SUITE(SchwarzFactory, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(SchwarzFactory, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/core/test/mpi/distributed/vector_cache.cpp b/core/test/mpi/distributed/vector_cache.cpp
index f64c5fe9038..320d37c3c33 100644
--- a/core/test/mpi/distributed/vector_cache.cpp
+++ b/core/test/mpi/distributed/vector_cache.cpp
@@ -42,7 +42,7 @@ class VectorCache : public ::testing::Test {
 };
 
 
-TYPED_TEST_SUITE(VectorCache, gko::test::ValueTypes, TypenameNameGenerator);
+TYPED_TEST_SUITE(VectorCache, gko::test::ValueTypesBase, TypenameNameGenerator);
 
 
 TYPED_TEST(VectorCache, CanDefaultConstruct)
diff --git a/core/test/multigrid/fixed_coarsening.cpp b/core/test/multigrid/fixed_coarsening.cpp
index 35bd04bb067..5cab7282b5d 100644
--- a/core/test/multigrid/fixed_coarsening.cpp
+++ b/core/test/multigrid/fixed_coarsening.cpp
@@ -38,7 +38,7 @@ class FixedCoarseningFactory : public ::testing::Test {
     std::unique_ptr<typename MgLevel::Factory> fixed_coarsening_factory;
 };
 
-TYPED_TEST_SUITE(FixedCoarseningFactory, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(FixedCoarseningFactory, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/multigrid/pgm.cpp b/core/test/multigrid/pgm.cpp
index c06edda60a0..7798e97f5d6 100644
--- a/core/test/multigrid/pgm.cpp
+++ b/core/test/multigrid/pgm.cpp
@@ -40,7 +40,7 @@ class PgmFactory : public ::testing::Test {
     std::unique_ptr<typename MgLevel::Factory> pgm_factory;
 };
 
-TYPED_TEST_SUITE(PgmFactory, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(PgmFactory, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/preconditioner/isai.cpp b/core/test/preconditioner/isai.cpp
index b2ee8175d49..b5e7400d0e8 100644
--- a/core/test/preconditioner/isai.cpp
+++ b/core/test/preconditioner/isai.cpp
@@ -64,7 +64,7 @@ class IsaiFactory : public ::testing::Test {
     std::unique_ptr<typename UpperIsai::Factory> upper_isai_factory;
 };
 
-TYPED_TEST_SUITE(IsaiFactory, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(IsaiFactory, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/preconditioner/jacobi.cpp b/core/test/preconditioner/jacobi.cpp
index 40bc9e8d494..8813b4c3c4d 100644
--- a/core/test/preconditioner/jacobi.cpp
+++ b/core/test/preconditioner/jacobi.cpp
@@ -43,7 +43,7 @@ class JacobiFactory : public ::testing::Test {
     std::shared_ptr<gko::matrix::Csr<value_type, index_type>> mtx;
 };
 
-TYPED_TEST_SUITE(JacobiFactory, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(JacobiFactory, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/reorder/amd.cpp b/core/test/reorder/amd.cpp
index 9eecf3777e1..31ad99d7695 100644
--- a/core/test/reorder/amd.cpp
+++ b/core/test/reorder/amd.cpp
@@ -177,7 +177,8 @@ class Amd : public ::testing::Test {
     std::shared_ptr<gko::experimental::reorder::Amd<index_type>> amd;
 };
 
-TYPED_TEST_SUITE(Amd, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Amd, gko::test::ValueIndexTypesBase,
+                 PairTypenameNameGenerator);
 
 
 TYPED_TEST(Amd, WorksAndReducesFillIn)
diff --git a/core/test/solver/batch_bicgstab.cpp b/core/test/solver/batch_bicgstab.cpp
index 0b50f7f6e92..cd9446d07b2 100644
--- a/core/test/solver/batch_bicgstab.cpp
+++ b/core/test/solver/batch_bicgstab.cpp
@@ -50,8 +50,7 @@ class BatchBicgstab : public ::testing::Test {
     std::unique_ptr<gko::batch::BatchLinOp> solver;
 };
 
-TYPED_TEST_SUITE(BatchBicgstab, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(BatchBicgstab, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(BatchBicgstab, FactoryKnowsItsExecutor)
diff --git a/core/test/solver/batch_cg.cpp b/core/test/solver/batch_cg.cpp
index b517c931adf..1e97c765f8a 100644
--- a/core/test/solver/batch_cg.cpp
+++ b/core/test/solver/batch_cg.cpp
@@ -50,7 +50,7 @@ class BatchCg : public ::testing::Test {
     std::unique_ptr<gko::batch::BatchLinOp> solver;
 };
 
-TYPED_TEST_SUITE(BatchCg, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(BatchCg, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(BatchCg, FactoryKnowsItsExecutor)
diff --git a/core/test/solver/bicg.cpp b/core/test/solver/bicg.cpp
index a229bd85ed9..e5a40e0c4f8 100644
--- a/core/test/solver/bicg.cpp
+++ b/core/test/solver/bicg.cpp
@@ -46,7 +46,7 @@ class Bicg : public ::testing::Test {
     std::unique_ptr<gko::LinOp> solver;
 };
 
-TYPED_TEST_SUITE(Bicg, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Bicg, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Bicg, BicgFactoryKnowsItsExecutor)
diff --git a/core/test/solver/bicgstab.cpp b/core/test/solver/bicgstab.cpp
index 23695fe1355..f8b8d3c7b05 100644
--- a/core/test/solver/bicgstab.cpp
+++ b/core/test/solver/bicgstab.cpp
@@ -45,8 +45,7 @@ class Bicgstab : public ::testing::Test {
     std::unique_ptr<gko::LinOp> solver;
 };
 
-TYPED_TEST_SUITE(Bicgstab, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Bicgstab, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Bicgstab, BicgstabFactoryKnowsItsExecutor)
diff --git a/core/test/solver/cb_gmres.cpp b/core/test/solver/cb_gmres.cpp
index e014e5f8acc..70eb34a8440 100644
--- a/core/test/solver/cb_gmres.cpp
+++ b/core/test/solver/cb_gmres.cpp
@@ -87,9 +87,9 @@ using st_ir2 = st_helper_type<st_enum::ireduce2>;
 
 using TestTypes = gko::test::merge_type_list_t<
     gko::test::cartesian_type_product_t<
-        gko::test::ValueTypes, ::testing::Types<st_keep, st_r1, st_r2>>,
+        gko::test::ValueTypesBase, ::testing::Types<st_keep, st_r1, st_r2>>,
     gko::test::cartesian_type_product_t<
-        gko::test::RealValueTypes, ::testing::Types<st_i, st_ir1, st_ir2>>>;
+        gko::test::RealValueTypesBase, ::testing::Types<st_i, st_ir1, st_ir2>>>;
 
 TYPED_TEST_SUITE(CbGmres, TestTypes, PairTypenameNameGenerator);
 
diff --git a/core/test/solver/cg.cpp b/core/test/solver/cg.cpp
index 95552d841ac..cbf637de302 100644
--- a/core/test/solver/cg.cpp
+++ b/core/test/solver/cg.cpp
@@ -46,7 +46,7 @@ class Cg : public ::testing::Test {
     std::unique_ptr<gko::LinOp> solver;
 };
 
-TYPED_TEST_SUITE(Cg, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Cg, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Cg, CgFactoryKnowsItsExecutor)
diff --git a/core/test/solver/cgs.cpp b/core/test/solver/cgs.cpp
index cc355b58270..5dc80892a1b 100644
--- a/core/test/solver/cgs.cpp
+++ b/core/test/solver/cgs.cpp
@@ -46,7 +46,7 @@ class Cgs : public ::testing::Test {
     std::unique_ptr<gko::LinOp> solver;
 };
 
-TYPED_TEST_SUITE(Cgs, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Cgs, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Cgs, CgsFactoryKnowsItsExecutor)
diff --git a/core/test/solver/direct.cpp b/core/test/solver/direct.cpp
index 43acdd0bdf1..d895892a8be 100644
--- a/core/test/solver/direct.cpp
+++ b/core/test/solver/direct.cpp
@@ -35,8 +35,7 @@ class Direct : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> factory;
 };
 
-TYPED_TEST_SUITE(Direct, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Direct, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Direct, FactoryKnowsItsExecutor)
diff --git a/core/test/solver/fcg.cpp b/core/test/solver/fcg.cpp
index c92fa4bb7f1..2898a5f5c46 100644
--- a/core/test/solver/fcg.cpp
+++ b/core/test/solver/fcg.cpp
@@ -44,7 +44,7 @@ class Fcg : public ::testing::Test {
     std::unique_ptr<gko::LinOp> solver;
 };
 
-TYPED_TEST_SUITE(Fcg, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Fcg, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Fcg, FcgFactoryKnowsItsExecutor)
diff --git a/core/test/solver/gcr.cpp b/core/test/solver/gcr.cpp
index 58194f6e92a..add10957c7d 100644
--- a/core/test/solver/gcr.cpp
+++ b/core/test/solver/gcr.cpp
@@ -70,7 +70,7 @@ class Gcr : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Gcr, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Gcr, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Gcr, GcrFactoryKnowsItsExecutor)
diff --git a/core/test/solver/gmres.cpp b/core/test/solver/gmres.cpp
index 50f505f6321..9d4514f66e0 100644
--- a/core/test/solver/gmres.cpp
+++ b/core/test/solver/gmres.cpp
@@ -60,7 +60,7 @@ class Gmres : public ::testing::Test {
     std::unique_ptr<gko::LinOp> big_solver;
 };
 
-TYPED_TEST_SUITE(Gmres, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Gmres, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Gmres, GmresFactoryKnowsItsExecutor)
diff --git a/core/test/solver/idr.cpp b/core/test/solver/idr.cpp
index 823327e337e..9eb79356046 100644
--- a/core/test/solver/idr.cpp
+++ b/core/test/solver/idr.cpp
@@ -45,7 +45,7 @@ class Idr : public ::testing::Test {
     std::unique_ptr<gko::LinOp> solver;
 };
 
-TYPED_TEST_SUITE(Idr, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Idr, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Idr, IdrFactoryKnowsItsExecutor)
diff --git a/core/test/solver/ir.cpp b/core/test/solver/ir.cpp
index 59f85f42321..1137862a395 100644
--- a/core/test/solver/ir.cpp
+++ b/core/test/solver/ir.cpp
@@ -46,7 +46,7 @@ class Ir : public ::testing::Test {
     std::unique_ptr<gko::LinOp> solver;
 };
 
-TYPED_TEST_SUITE(Ir, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Ir, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Ir, IrFactoryKnowsItsExecutor)
diff --git a/core/test/solver/lower_trs.cpp b/core/test/solver/lower_trs.cpp
index ae07e08c3f7..dfcb564ca12 100644
--- a/core/test/solver/lower_trs.cpp
+++ b/core/test/solver/lower_trs.cpp
@@ -33,7 +33,7 @@ class LowerTrs : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> lower_trs_factory;
 };
 
-TYPED_TEST_SUITE(LowerTrs, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(LowerTrs, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/solver/multigrid.cpp b/core/test/solver/multigrid.cpp
index 54c4a18b8d3..85be8402243 100644
--- a/core/test/solver/multigrid.cpp
+++ b/core/test/solver/multigrid.cpp
@@ -164,8 +164,7 @@ class Multigrid : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(Multigrid, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Multigrid, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Multigrid, MultigridFactoryKnowsItsExecutor)
diff --git a/core/test/solver/upper_trs.cpp b/core/test/solver/upper_trs.cpp
index bc53d1a193c..2e84cb81e10 100644
--- a/core/test/solver/upper_trs.cpp
+++ b/core/test/solver/upper_trs.cpp
@@ -33,7 +33,7 @@ class UpperTrs : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> upper_trs_factory;
 };
 
-TYPED_TEST_SUITE(UpperTrs, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(UpperTrs, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/utils.hpp b/core/test/utils.hpp
index ab9326400e0..e9c4c5e0c99 100644
--- a/core/test/utils.hpp
+++ b/core/test/utils.hpp
@@ -321,14 +321,14 @@ using add_inner_wrapper_t =
     typename detail::add_inner_wrapper<NewInnerWrapper, ListType>::type;
 
 
-using RealValueTypes =
+using RealValueTypesBase =
 #if GINKGO_DPCPP_SINGLE_MODE
     ::testing::Types<float>;
 #else
     ::testing::Types<float, double>;
 #endif
 
-using RealValueTypesWithHalf = ::testing::Types<
+using RealValueTypes = ::testing::Types<
 #if GINKGO_ENABLE_HALF
     gko::half,
 #endif
@@ -337,16 +337,16 @@ using RealValueTypesWithHalf = ::testing::Types<
 #endif
     float>;
 
+using ComplexValueTypesBase =
+    add_inner_wrapper_t<std::complex, RealValueTypesBase>;
+
 using ComplexValueTypes = add_inner_wrapper_t<std::complex, RealValueTypes>;
 
-using ComplexValueTypesWithHalf =
-    add_inner_wrapper_t<std::complex, RealValueTypesWithHalf>;
+using ValueTypesBase =
+    merge_type_list_t<RealValueTypesBase, ComplexValueTypesBase>;
 
 using ValueTypes = merge_type_list_t<RealValueTypes, ComplexValueTypes>;
 
-using ValueTypesWithHalf =
-    merge_type_list_t<RealValueTypesWithHalf, ComplexValueTypesWithHalf>;
-
 using IndexTypes = ::testing::Types<int32, int64>;
 
 using IntegerTypes = merge_type_list_t<IndexTypes, ::testing::Types<size_type>>;
@@ -355,48 +355,46 @@ using LocalGlobalIndexTypes =
     ::testing::Types<std::tuple<int32, int32>, std::tuple<int32, int64>,
                      std::tuple<int64, int64>>;
 
+using PODTypesBase = merge_type_list_t<RealValueTypesBase, IntegerTypes>;
+
 using PODTypes = merge_type_list_t<RealValueTypes, IntegerTypes>;
 
-using PODTypesWithHalf =
-    merge_type_list_t<RealValueTypesWithHalf, IntegerTypes>;
+using ComplexAndPODTypesBase =
+    merge_type_list_t<ComplexValueTypesBase, PODTypesBase>;
 
-using ComplexAndPODTypes = merge_type_list_t<ComplexValueTypes, PODTypes>;
+using ComplexAndPODTypes = merge_type_list_t<ComplexValueTypes, PODTypesBase>;
 
-using ComplexAndPODTypesWithHalf =
-    merge_type_list_t<ComplexValueTypesWithHalf, PODTypes>;
+using ValueIndexTypesBase =
+    cartesian_type_product_t<ValueTypesBase, IndexTypes>;
 
 using ValueIndexTypes = cartesian_type_product_t<ValueTypes, IndexTypes>;
 
-using ValueIndexTypesWithHalf =
-    cartesian_type_product_t<ValueTypesWithHalf, IndexTypes>;
+using RealValueIndexTypesBase =
+    cartesian_type_product_t<RealValueTypesBase, IndexTypes>;
 
 using RealValueIndexTypes =
     cartesian_type_product_t<RealValueTypes, IndexTypes>;
 
-using RealValueIndexTypesWithHalf =
-    cartesian_type_product_t<RealValueTypesWithHalf, IndexTypes>;
+using ComplexValueIndexTypesBase =
+    cartesian_type_product_t<ComplexValueTypesBase, IndexTypes>;
 
 using ComplexValueIndexTypes =
     cartesian_type_product_t<ComplexValueTypes, IndexTypes>;
 
-using ComplexValueIndexTypesWithHalf =
-    cartesian_type_product_t<ComplexValueTypesWithHalf, IndexTypes>;
+using TwoValueIndexTypesBase = add_to_cartesian_type_product_t<
+    merge_type_list_t<
+        cartesian_type_product_t<RealValueTypesBase, RealValueTypesBase>,
+        cartesian_type_product_t<ComplexValueTypesBase, ComplexValueTypesBase>>,
+    IndexTypes>;
 
-using TwoValueIndexType = add_to_cartesian_type_product_t<
+using TwoValueIndexTypes = add_to_cartesian_type_product_t<
     merge_type_list_t<
         cartesian_type_product_t<RealValueTypes, RealValueTypes>,
         cartesian_type_product_t<ComplexValueTypes, ComplexValueTypes>>,
     IndexTypes>;
 
-using TwoValueIndexTypeWithHalf = add_to_cartesian_type_product_t<
-    merge_type_list_t<cartesian_type_product_t<RealValueTypesWithHalf,
-                                               RealValueTypesWithHalf>,
-                      cartesian_type_product_t<ComplexValueTypesWithHalf,
-                                               ComplexValueTypesWithHalf>>,
-    IndexTypes>;
-
-using ValueLocalGlobalIndexTypes =
-    add_to_cartesian_type_product_left_t<ValueTypes, LocalGlobalIndexTypes>;
+using ValueLocalGlobalIndexTypesBase =
+    add_to_cartesian_type_product_left_t<ValueTypesBase, LocalGlobalIndexTypes>;
 
 
 template <typename Precision, typename OutputType>
diff --git a/core/test/utils/array_generator_test.cpp b/core/test/utils/array_generator_test.cpp
index ca96761ea4e..3933dd7db7a 100644
--- a/core/test/utils/array_generator_test.cpp
+++ b/core/test/utils/array_generator_test.cpp
@@ -65,8 +65,7 @@ class ArrayGenerator : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(ArrayGenerator, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(ArrayGenerator, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(ArrayGenerator, OutputHasCorrectSize)
diff --git a/core/test/utils/matrix_generator_test.cpp b/core/test/utils/matrix_generator_test.cpp
index 61710540e24..c41a20b0efb 100644
--- a/core/test/utils/matrix_generator_test.cpp
+++ b/core/test/utils/matrix_generator_test.cpp
@@ -131,8 +131,7 @@ class MatrixGenerator : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(MatrixGenerator, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(MatrixGenerator, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(MatrixGenerator, OutputHasCorrectSize)
diff --git a/core/test/utils/matrix_utils_test.cpp b/core/test/utils/matrix_utils_test.cpp
index f742d4561a2..3f692edeed6 100644
--- a/core/test/utils/matrix_utils_test.cpp
+++ b/core/test/utils/matrix_utils_test.cpp
@@ -41,8 +41,7 @@ class MatrixUtils : public ::testing::Test {
     mtx_data rectangular_data;
 };
 
-TYPED_TEST_SUITE(MatrixUtils, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(MatrixUtils, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(MatrixUtils, MakeSymmetricThrowsError)
diff --git a/core/test/utils/unsort_matrix_test.cpp b/core/test/utils/unsort_matrix_test.cpp
index 40ec65b08db..5d2f88f982a 100644
--- a/core/test/utils/unsort_matrix_test.cpp
+++ b/core/test/utils/unsort_matrix_test.cpp
@@ -119,7 +119,7 @@ class UnsortMatrix : public ::testing::Test {
     std::unique_ptr<Coo> coo_empty;
 };
 
-TYPED_TEST_SUITE(UnsortMatrix, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(UnsortMatrix, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/core/test/utils/value_generator_test.cpp b/core/test/utils/value_generator_test.cpp
index 57473c41b6e..829c9b54be2 100644
--- a/core/test/utils/value_generator_test.cpp
+++ b/core/test/utils/value_generator_test.cpp
@@ -59,8 +59,7 @@ class ValueGenerator : public ::testing::Test {
     }
 };
 
-TYPED_TEST_SUITE(ValueGenerator, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(ValueGenerator, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(ValueGenerator, OutputHasCorrectAverageAndDeviation)
diff --git a/cuda/test/base/array.cpp b/cuda/test/base/array.cpp
index 7294cbff29f..db7d4c54536 100644
--- a/cuda/test/base/array.cpp
+++ b/cuda/test/base/array.cpp
@@ -32,8 +32,7 @@ class Array : public CudaTestFixture {
     gko::array<T> x;
 };
 
-TYPED_TEST_SUITE(Array, gko::test::ComplexAndPODTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Array, gko::test::ComplexAndPODTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Array, CanCreateTemporaryCloneOnDifferentExecutor)
diff --git a/extensions/test/kokkos/types.cpp b/extensions/test/kokkos/types.cpp
index bb3252b149c..ec59e3fb04c 100644
--- a/extensions/test/kokkos/types.cpp
+++ b/extensions/test/kokkos/types.cpp
@@ -29,7 +29,7 @@ class ArrayMapper : public ::testing::Test {
     gko::array<value_type> array = {exec, I<value_type>{1, 2, 3, 4}};
 };
 
-TYPED_TEST_SUITE(ArrayMapper, gko::test::ValueTypes, TypenameNameGenerator);
+TYPED_TEST_SUITE(ArrayMapper, gko::test::ValueTypesBase, TypenameNameGenerator);
 
 
 TYPED_TEST(ArrayMapper, CanMapDefault)
@@ -89,7 +89,7 @@ class DenseMapper : public ::testing::Test {
         gko::initialize<mtx_type>({1, 2, 3, 4}, exec);
 };
 
-TYPED_TEST_SUITE(DenseMapper, gko::test::ValueTypes, TypenameNameGenerator);
+TYPED_TEST_SUITE(DenseMapper, gko::test::ValueTypesBase, TypenameNameGenerator);
 
 
 TYPED_TEST(DenseMapper, CanMapDefault)
diff --git a/hip/test/matrix/fbcsr_kernels.cpp b/hip/test/matrix/fbcsr_kernels.cpp
index 536ff3dc01c..0bed7e7c13e 100644
--- a/hip/test/matrix/fbcsr_kernels.cpp
+++ b/hip/test/matrix/fbcsr_kernels.cpp
@@ -61,8 +61,7 @@ class Fbcsr : public HipTestFixture {
     }
 };
 
-TYPED_TEST_SUITE(Fbcsr, gko::test::RealValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Fbcsr, gko::test::RealValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Fbcsr, CanWriteFromMatrixOnDevice)
diff --git a/reference/test/base/array.cpp b/reference/test/base/array.cpp
index 2c69f1afc8e..666ab13063c 100644
--- a/reference/test/base/array.cpp
+++ b/reference/test/base/array.cpp
@@ -28,8 +28,7 @@ class Array : public ::testing::Test {
     gko::array<T> x;
 };
 
-TYPED_TEST_SUITE(Array, gko::test::ComplexAndPODTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Array, gko::test::ComplexAndPODTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Array, CanBeFilledWithValue)
diff --git a/reference/test/base/batch_multi_vector_kernels.cpp b/reference/test/base/batch_multi_vector_kernels.cpp
index 7ef9b77601d..694ae491ef4 100644
--- a/reference/test/base/batch_multi_vector_kernels.cpp
+++ b/reference/test/base/batch_multi_vector_kernels.cpp
@@ -96,8 +96,7 @@ class MultiVector : public ::testing::Test {
     std::default_random_engine rand_engine;
 };
 
-TYPED_TEST_SUITE(MultiVector, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(MultiVector, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(MultiVector, ScalesData)
diff --git a/reference/test/base/combination.cpp b/reference/test/base/combination.cpp
index cfb5abcdba0..aea578f4e7e 100644
--- a/reference/test/base/combination.cpp
+++ b/reference/test/base/combination.cpp
@@ -34,8 +34,7 @@ class Combination : public ::testing::Test {
     std::vector<std::shared_ptr<gko::LinOp>> operators;
 };
 
-TYPED_TEST_SUITE(Combination, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Combination, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Combination, CopiesOnSameExecutor)
diff --git a/reference/test/base/composition.cpp b/reference/test/base/composition.cpp
index 9767fab466c..f736edb53f9 100644
--- a/reference/test/base/composition.cpp
+++ b/reference/test/base/composition.cpp
@@ -75,8 +75,7 @@ class Composition : public ::testing::Test {
     std::shared_ptr<Mtx> product;
 };
 
-TYPED_TEST_SUITE(Composition, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Composition, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Composition, CopiesOnSameExecutor)
diff --git a/reference/test/base/perturbation.cpp b/reference/test/base/perturbation.cpp
index 1563f22e175..b6be9ab1563 100644
--- a/reference/test/base/perturbation.cpp
+++ b/reference/test/base/perturbation.cpp
@@ -33,8 +33,7 @@ class Perturbation : public ::testing::Test {
     std::shared_ptr<gko::LinOp> scalar;
 };
 
-TYPED_TEST_SUITE(Perturbation, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Perturbation, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Perturbation, CopiesOnSameExecutor)
diff --git a/reference/test/components/absolute_array_kernels.cpp b/reference/test/components/absolute_array_kernels.cpp
index 5ad75440c88..c192d540032 100644
--- a/reference/test/components/absolute_array_kernels.cpp
+++ b/reference/test/components/absolute_array_kernels.cpp
@@ -43,8 +43,7 @@ class AbsoluteArray : public ::testing::Test {
     gko::array<value_type> vals;
 };
 
-TYPED_TEST_SUITE(AbsoluteArray, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(AbsoluteArray, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(AbsoluteArray, InplaceEqualsExpected)
diff --git a/reference/test/components/fill_array_kernels.cpp b/reference/test/components/fill_array_kernels.cpp
index 0a9239ce1bd..3c7520c6847 100644
--- a/reference/test/components/fill_array_kernels.cpp
+++ b/reference/test/components/fill_array_kernels.cpp
@@ -40,7 +40,7 @@ class FillArray : public ::testing::Test {
     gko::array<value_type> seqs;
 };
 
-TYPED_TEST_SUITE(FillArray, gko::test::ComplexAndPODTypesWithHalf,
+TYPED_TEST_SUITE(FillArray, gko::test::ComplexAndPODTypes,
                  TypenameNameGenerator);
 
 
diff --git a/reference/test/components/reduce_array_kernels.cpp b/reference/test/components/reduce_array_kernels.cpp
index c8839bc178d..8286817c853 100644
--- a/reference/test/components/reduce_array_kernels.cpp
+++ b/reference/test/components/reduce_array_kernels.cpp
@@ -31,7 +31,7 @@ class ReduceArray : public ::testing::Test {
     gko::array<value_type> vals;
 };
 
-TYPED_TEST_SUITE(ReduceArray, gko::test::ComplexAndPODTypesWithHalf,
+TYPED_TEST_SUITE(ReduceArray, gko::test::ComplexAndPODTypes,
                  TypenameNameGenerator);
 
 
diff --git a/reference/test/distributed/assembly_kernels.cpp b/reference/test/distributed/assembly_kernels.cpp
index 89662b4efef..4823f465a31 100644
--- a/reference/test/distributed/assembly_kernels.cpp
+++ b/reference/test/distributed/assembly_kernels.cpp
@@ -48,7 +48,7 @@ class AssemblyHelpers : public ::testing::Test {
     gko::array<comm_index_type> mapping;
 };
 
-TYPED_TEST_SUITE(AssemblyHelpers, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(AssemblyHelpers, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/reference/test/distributed/matrix_kernels.cpp b/reference/test/distributed/matrix_kernels.cpp
index a34844cbde9..b5e2e3f5fb9 100644
--- a/reference/test/distributed/matrix_kernels.cpp
+++ b/reference/test/distributed/matrix_kernels.cpp
@@ -182,7 +182,7 @@ class Matrix : public ::testing::Test {
     gko::array<value_type> non_local_values;
 };
 
-TYPED_TEST_SUITE(Matrix, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(Matrix, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/reference/test/distributed/vector_kernels.cpp b/reference/test/distributed/vector_kernels.cpp
index 7de3104b7fb..43f11967488 100644
--- a/reference/test/distributed/vector_kernels.cpp
+++ b/reference/test/distributed/vector_kernels.cpp
@@ -69,7 +69,7 @@ class Vector : public ::testing::Test {
     std::shared_ptr<const gko::ReferenceExecutor> ref;
 };
 
-TYPED_TEST_SUITE(Vector, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(Vector, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/reference/test/factorization/cholesky_kernels.cpp b/reference/test/factorization/cholesky_kernels.cpp
index 671630c99eb..b4c33d76ab9 100644
--- a/reference/test/factorization/cholesky_kernels.cpp
+++ b/reference/test/factorization/cholesky_kernels.cpp
@@ -245,7 +245,7 @@ class Cholesky : public ::testing::Test {
     std::shared_ptr<matrix_type> combined_ref;
 };
 
-TYPED_TEST_SUITE(Cholesky, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(Cholesky, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/factorization/factorization.cpp b/reference/test/factorization/factorization.cpp
index 73bf8cdc321..2ded81d4867 100644
--- a/reference/test/factorization/factorization.cpp
+++ b/reference/test/factorization/factorization.cpp
@@ -70,7 +70,7 @@ class Factorization : public ::testing::Test {
     std::shared_ptr<vector_type> beta;
 };
 
-TYPED_TEST_SUITE(Factorization, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(Factorization, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/factorization/ic_kernels.cpp b/reference/test/factorization/ic_kernels.cpp
index 84faa3c3b45..1593da136a4 100644
--- a/reference/test/factorization/ic_kernels.cpp
+++ b/reference/test/factorization/ic_kernels.cpp
@@ -80,8 +80,7 @@ class Ic : public ::testing::Test {
     gko::remove_complex<value_type> tol;
 };
 
-TYPED_TEST_SUITE(Ic, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Ic, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Ic, ThrowNotSupportedForWrongLinOp)
diff --git a/reference/test/factorization/ilu_kernels.cpp b/reference/test/factorization/ilu_kernels.cpp
index 1ba1fedf13f..aaeb44382f1 100644
--- a/reference/test/factorization/ilu_kernels.cpp
+++ b/reference/test/factorization/ilu_kernels.cpp
@@ -170,8 +170,7 @@ class Ilu : public ::testing::Test {
     std::unique_ptr<typename ilu_type::Factory> ilu_factory_sort;
 };
 
-TYPED_TEST_SUITE(Ilu, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Ilu, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Ilu, ThrowNotSupportedForWrongLinOp1)
diff --git a/reference/test/factorization/lu_kernels.cpp b/reference/test/factorization/lu_kernels.cpp
index 7b4a860b0d5..1ea77665f69 100644
--- a/reference/test/factorization/lu_kernels.cpp
+++ b/reference/test/factorization/lu_kernels.cpp
@@ -98,8 +98,7 @@ class Lu : public ::testing::Test {
     gko::array<gko::int64> row_descs;
 };
 
-TYPED_TEST_SUITE(Lu, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Lu, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Lu, SymbolicCholeskyWorks)
diff --git a/reference/test/factorization/par_ic_kernels.cpp b/reference/test/factorization/par_ic_kernels.cpp
index 481e89bb744..b9caf8c9e5e 100644
--- a/reference/test/factorization/par_ic_kernels.cpp
+++ b/reference/test/factorization/par_ic_kernels.cpp
@@ -104,8 +104,7 @@ class ParIc : public ::testing::Test {
     gko::remove_complex<value_type> tol;
 };
 
-TYPED_TEST_SUITE(ParIc, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIc, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIc, KernelCompute)
diff --git a/reference/test/factorization/par_ict_kernels.cpp b/reference/test/factorization/par_ict_kernels.cpp
index d3b6df59f42..55ac5771732 100644
--- a/reference/test/factorization/par_ict_kernels.cpp
+++ b/reference/test/factorization/par_ict_kernels.cpp
@@ -137,8 +137,7 @@ class ParIct : public ::testing::Test {
     gko::remove_complex<value_type> tol;
 };
 
-TYPED_TEST_SUITE(ParIct, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIct, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIct, KernelInitializeRowPtrsL)
diff --git a/reference/test/factorization/par_ilu_kernels.cpp b/reference/test/factorization/par_ilu_kernels.cpp
index 3d590c1a6d6..bf4e422f640 100644
--- a/reference/test/factorization/par_ilu_kernels.cpp
+++ b/reference/test/factorization/par_ilu_kernels.cpp
@@ -180,8 +180,7 @@ class ParIlu : public ::testing::Test {
     std::unique_ptr<typename par_ilu_type::Factory> ilu_factory_sort;
 };
 
-TYPED_TEST_SUITE(ParIlu, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIlu, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIlu, KernelAddDiagonalElementsEmpty)
diff --git a/reference/test/factorization/par_ilut_kernels.cpp b/reference/test/factorization/par_ilut_kernels.cpp
index 3a6ba9232da..a605ed678ae 100644
--- a/reference/test/factorization/par_ilut_kernels.cpp
+++ b/reference/test/factorization/par_ilut_kernels.cpp
@@ -277,7 +277,7 @@ class ParIlut : public ::testing::Test {
     gko::remove_complex<value_type> tol;
 };  // namespace
 
-TYPED_TEST_SUITE(ParIlut, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(ParIlut, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/log/convergence.cpp b/reference/test/log/convergence.cpp
index 70fc004c030..50db0db49c4 100644
--- a/reference/test/log/convergence.cpp
+++ b/reference/test/log/convergence.cpp
@@ -19,8 +19,7 @@ namespace {
 template <typename T>
 class Convergence : public ::testing::Test {};
 
-TYPED_TEST_SUITE(Convergence, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Convergence, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Convergence, CatchesCriterionCheckCompleted)
diff --git a/reference/test/log/papi.cpp b/reference/test/log/papi.cpp
index 647a14af9b2..4f1d9e469f1 100644
--- a/reference/test/log/papi.cpp
+++ b/reference/test/log/papi.cpp
@@ -83,7 +83,7 @@ class Papi : public ::testing::Test {
     int eventset;
 };
 
-TYPED_TEST_SUITE(Papi, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Papi, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Papi, CatchesCriterionCheckCompleted)
diff --git a/reference/test/matrix/batch_csr_kernels.cpp b/reference/test/matrix/batch_csr_kernels.cpp
index 85e461b933e..920bb67696b 100644
--- a/reference/test/matrix/batch_csr_kernels.cpp
+++ b/reference/test/matrix/batch_csr_kernels.cpp
@@ -78,7 +78,7 @@ class Csr : public ::testing::Test {
     std::ranlux48 rand_engine;
 };
 
-TYPED_TEST_SUITE(Csr, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Csr, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Csr, AppliesToBatchMultiVector)
diff --git a/reference/test/matrix/batch_dense_kernels.cpp b/reference/test/matrix/batch_dense_kernels.cpp
index 23f747c24cb..50c1909959f 100644
--- a/reference/test/matrix/batch_dense_kernels.cpp
+++ b/reference/test/matrix/batch_dense_kernels.cpp
@@ -77,7 +77,7 @@ class Dense : public ::testing::Test {
 };
 
 
-TYPED_TEST_SUITE(Dense, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Dense, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Dense, AppliesToBatchMultiVector)
diff --git a/reference/test/matrix/batch_ell_kernels.cpp b/reference/test/matrix/batch_ell_kernels.cpp
index 5e2b377eda0..a2c9ef4e83c 100644
--- a/reference/test/matrix/batch_ell_kernels.cpp
+++ b/reference/test/matrix/batch_ell_kernels.cpp
@@ -79,7 +79,7 @@ class Ell : public ::testing::Test {
 };
 
 
-TYPED_TEST_SUITE(Ell, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Ell, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Ell, AppliesToBatchMultiVector)
diff --git a/reference/test/matrix/coo_kernels.cpp b/reference/test/matrix/coo_kernels.cpp
index b3f58ec3083..f7063317a73 100644
--- a/reference/test/matrix/coo_kernels.cpp
+++ b/reference/test/matrix/coo_kernels.cpp
@@ -72,8 +72,7 @@ class Coo : public ::testing::Test {
     std::unique_ptr<Mtx> uns_mtx;
 };
 
-TYPED_TEST_SUITE(Coo, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Coo, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Coo, ConvertsToPrecision)
@@ -911,7 +910,7 @@ class CooComplex : public ::testing::Test {
     using Mtx = gko::matrix::Coo<value_type, index_type>;
 };
 
-TYPED_TEST_SUITE(CooComplex, gko::test::ComplexValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(CooComplex, gko::test::ComplexValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/csr_kernels.cpp b/reference/test/matrix/csr_kernels.cpp
index 61018563769..b84ac958f02 100644
--- a/reference/test/matrix/csr_kernels.cpp
+++ b/reference/test/matrix/csr_kernels.cpp
@@ -347,8 +347,7 @@ class Csr : public ::testing::Test {
     index_type invalid_index = gko::invalid_index<index_type>();
 };
 
-TYPED_TEST_SUITE(Csr, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Csr, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Csr, AppliesToDenseVector)
@@ -2246,7 +2245,7 @@ class CsrComplex : public ::testing::Test {
     using Mtx = gko::matrix::Csr<value_type, index_type>;
 };
 
-TYPED_TEST_SUITE(CsrComplex, gko::test::ComplexValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(CsrComplex, gko::test::ComplexValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
@@ -2591,7 +2590,7 @@ class CsrLookup : public ::testing::Test {
     index_type invalid_index = gko::invalid_index<index_type>();
 };
 
-TYPED_TEST_SUITE(CsrLookup, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(CsrLookup, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 TYPED_TEST(CsrLookup, GeneratesLookupDataOffsets)
diff --git a/reference/test/matrix/dense_kernels.cpp b/reference/test/matrix/dense_kernels.cpp
index 9ab59b0b4b8..9fe0e91a670 100644
--- a/reference/test/matrix/dense_kernels.cpp
+++ b/reference/test/matrix/dense_kernels.cpp
@@ -80,7 +80,7 @@ class Dense : public ::testing::Test {
 };
 
 
-TYPED_TEST_SUITE(Dense, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Dense, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Dense, CopyRespectsStride)
@@ -1359,7 +1359,7 @@ class DenseWithIndexType
     std::unique_ptr<ScaledPermutation> scale_perm0;
 };
 
-TYPED_TEST_SUITE(DenseWithIndexType, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(DenseWithIndexType, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
@@ -3552,7 +3552,7 @@ class DenseComplex : public ::testing::Test {
 };
 
 
-TYPED_TEST_SUITE(DenseComplex, gko::test::ComplexValueTypesWithHalf,
+TYPED_TEST_SUITE(DenseComplex, gko::test::ComplexValueTypes,
                  TypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/diagonal_kernels.cpp b/reference/test/matrix/diagonal_kernels.cpp
index b25c3593595..4517ba43c86 100644
--- a/reference/test/matrix/diagonal_kernels.cpp
+++ b/reference/test/matrix/diagonal_kernels.cpp
@@ -79,8 +79,7 @@ class Diagonal : public ::testing::Test {
     std::unique_ptr<Dense> dense3;
 };
 
-TYPED_TEST_SUITE(Diagonal, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Diagonal, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Diagonal, ConvertsToPrecision)
@@ -674,7 +673,7 @@ class DiagonalComplex : public ::testing::Test {
     using Diag = gko::matrix::Diagonal<value_type>;
 };
 
-TYPED_TEST_SUITE(DiagonalComplex, gko::test::ComplexValueTypesWithHalf,
+TYPED_TEST_SUITE(DiagonalComplex, gko::test::ComplexValueTypes,
                  TypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/ell_kernels.cpp b/reference/test/matrix/ell_kernels.cpp
index 4f96742d3f7..6214db82d1c 100644
--- a/reference/test/matrix/ell_kernels.cpp
+++ b/reference/test/matrix/ell_kernels.cpp
@@ -72,8 +72,7 @@ class Ell : public ::testing::Test {
     std::unique_ptr<Mtx> mtx2;
 };
 
-TYPED_TEST_SUITE(Ell, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Ell, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Ell, AppliesToDenseVector)
@@ -993,7 +992,7 @@ class EllComplex : public ::testing::Test {
     using Mtx = gko::matrix::Ell<value_type, index_type>;
 };
 
-TYPED_TEST_SUITE(EllComplex, gko::test::ComplexValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(EllComplex, gko::test::ComplexValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/fbcsr_kernels.cpp b/reference/test/matrix/fbcsr_kernels.cpp
index decae21b986..043195e7b50 100644
--- a/reference/test/matrix/fbcsr_kernels.cpp
+++ b/reference/test/matrix/fbcsr_kernels.cpp
@@ -104,8 +104,7 @@ class Fbcsr : public ::testing::Test {
     const std::unique_ptr<const Mtx> mtxsq;
 };
 
-TYPED_TEST_SUITE(Fbcsr, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Fbcsr, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 template <typename T>
@@ -620,7 +619,7 @@ class FbcsrComplex : public ::testing::Test {
     using Csr = gko::matrix::Csr<value_type, index_type>;
 };
 
-TYPED_TEST_SUITE(FbcsrComplex, gko::test::ComplexValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(FbcsrComplex, gko::test::ComplexValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/fft_kernels.cpp b/reference/test/matrix/fft_kernels.cpp
index 12c2521b71c..a1f82ea9311 100644
--- a/reference/test/matrix/fft_kernels.cpp
+++ b/reference/test/matrix/fft_kernels.cpp
@@ -148,7 +148,7 @@ class Fft : public ::testing::Test {
     std::unique_ptr<Vec> dense_ifft3;
 };
 
-TYPED_TEST_SUITE(Fft, gko::test::ComplexValueTypes, TypenameNameGenerator);
+TYPED_TEST_SUITE(Fft, gko::test::ComplexValueTypesBase, TypenameNameGenerator);
 
 
 TYPED_TEST(Fft, ThrowsOnNonPowerOfTwo1D)
diff --git a/reference/test/matrix/hybrid_kernels.cpp b/reference/test/matrix/hybrid_kernels.cpp
index bdc2724e1de..87fd4c02811 100644
--- a/reference/test/matrix/hybrid_kernels.cpp
+++ b/reference/test/matrix/hybrid_kernels.cpp
@@ -96,8 +96,7 @@ class Hybrid : public ::testing::Test {
     std::unique_ptr<Mtx> mtx3;
 };
 
-TYPED_TEST_SUITE(Hybrid, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Hybrid, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Hybrid, AppliesToDenseVector)
@@ -796,7 +795,7 @@ class HybridComplex : public ::testing::Test {
     using Mtx = gko::matrix::Hybrid<value_type, index_type>;
 };
 
-TYPED_TEST_SUITE(HybridComplex, gko::test::ComplexValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(HybridComplex, gko::test::ComplexValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/identity.cpp b/reference/test/matrix/identity.cpp
index dc0f799ba70..11953de338a 100644
--- a/reference/test/matrix/identity.cpp
+++ b/reference/test/matrix/identity.cpp
@@ -29,8 +29,7 @@ class Identity : public ::testing::Test {
 };
 
 
-TYPED_TEST_SUITE(Identity, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Identity, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Identity, AppliesToVector)
diff --git a/reference/test/matrix/permutation.cpp b/reference/test/matrix/permutation.cpp
index b646a6fc67f..5418f97353b 100644
--- a/reference/test/matrix/permutation.cpp
+++ b/reference/test/matrix/permutation.cpp
@@ -51,7 +51,7 @@ class Permutation : public ::testing::Test {
     std::shared_ptr<const gko::Executor> exec;
 };
 
-TYPED_TEST_SUITE(Permutation, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(Permutation, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/scaled_permutation.cpp b/reference/test/matrix/scaled_permutation.cpp
index f2b3e66b4cd..6d8d49f5662 100644
--- a/reference/test/matrix/scaled_permutation.cpp
+++ b/reference/test/matrix/scaled_permutation.cpp
@@ -58,7 +58,7 @@ class ScaledPermutation : public ::testing::Test {
     std::unique_ptr<Mtx> perm2;
 };
 
-TYPED_TEST_SUITE(ScaledPermutation, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(ScaledPermutation, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/sellp_kernels.cpp b/reference/test/matrix/sellp_kernels.cpp
index 5e056997163..3208b8c42be 100644
--- a/reference/test/matrix/sellp_kernels.cpp
+++ b/reference/test/matrix/sellp_kernels.cpp
@@ -50,8 +50,7 @@ class Sellp : public ::testing::Test {
     std::unique_ptr<Mtx> mtx2;
 };
 
-TYPED_TEST_SUITE(Sellp, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Sellp, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Sellp, AppliesToDenseVector)
@@ -752,7 +751,7 @@ class SellpComplex : public ::testing::Test {
     using Mtx = gko::matrix::Sellp<value_type, index_type>;
 };
 
-TYPED_TEST_SUITE(SellpComplex, gko::test::ComplexValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(SellpComplex, gko::test::ComplexValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/sparsity_csr.cpp b/reference/test/matrix/sparsity_csr.cpp
index 8db0dee144f..d8ed6147e30 100644
--- a/reference/test/matrix/sparsity_csr.cpp
+++ b/reference/test/matrix/sparsity_csr.cpp
@@ -47,7 +47,7 @@ class SparsityCsr : public ::testing::Test {
     std::unique_ptr<Mtx> mtx;
 };
 
-TYPED_TEST_SUITE(SparsityCsr, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(SparsityCsr, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/matrix/sparsity_csr_kernels.cpp b/reference/test/matrix/sparsity_csr_kernels.cpp
index 03adbece035..f08d6c352ca 100644
--- a/reference/test/matrix/sparsity_csr_kernels.cpp
+++ b/reference/test/matrix/sparsity_csr_kernels.cpp
@@ -125,7 +125,7 @@ class SparsityCsr : public ::testing::Test {
     std::unique_ptr<Mtx> mtx3_unsorted;
 };
 
-TYPED_TEST_SUITE(SparsityCsr, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(SparsityCsr, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/multigrid/fixed_coarsening_kernels.cpp b/reference/test/multigrid/fixed_coarsening_kernels.cpp
index 001e23d6124..582950b4e17 100644
--- a/reference/test/multigrid/fixed_coarsening_kernels.cpp
+++ b/reference/test/multigrid/fixed_coarsening_kernels.cpp
@@ -143,7 +143,7 @@ class FixedCoarsening : public ::testing::Test {
     std::unique_ptr<MgLevel> mg_level;
 };
 
-TYPED_TEST_SUITE(FixedCoarsening, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(FixedCoarsening, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/multigrid/pgm_kernels.cpp b/reference/test/multigrid/pgm_kernels.cpp
index e715b2175d3..2fc754f23b3 100644
--- a/reference/test/multigrid/pgm_kernels.cpp
+++ b/reference/test/multigrid/pgm_kernels.cpp
@@ -187,8 +187,7 @@ class Pgm : public ::testing::Test {
     std::unique_ptr<MgLevel> mg_level;
 };
 
-TYPED_TEST_SUITE(Pgm, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Pgm, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Pgm, CanBeCopied)
diff --git a/reference/test/preconditioner/gauss_seidel.cpp b/reference/test/preconditioner/gauss_seidel.cpp
index 53db7f0781e..2b67b665d77 100644
--- a/reference/test/preconditioner/gauss_seidel.cpp
+++ b/reference/test/preconditioner/gauss_seidel.cpp
@@ -47,7 +47,7 @@ class GaussSeidel : public ::testing::Test {
     std::shared_ptr<csr_type> mtx = csr_type::create(exec);
 };
 
-TYPED_TEST_SUITE(GaussSeidel, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(GaussSeidel, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/preconditioner/ic.cpp b/reference/test/preconditioner/ic.cpp
index 3084f60ca1c..16ffc8d7b3c 100644
--- a/reference/test/preconditioner/ic.cpp
+++ b/reference/test/preconditioner/ic.cpp
@@ -67,8 +67,7 @@ class Ic : public ::testing::Test {
     gko::remove_complex<value_type> tol;
 };
 
-TYPED_TEST_SUITE(Ic, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Ic, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Ic, BuildsTwoFactorComposition)
diff --git a/reference/test/preconditioner/ilu.cpp b/reference/test/preconditioner/ilu.cpp
index 1c7deddf56c..180b92be9ec 100644
--- a/reference/test/preconditioner/ilu.cpp
+++ b/reference/test/preconditioner/ilu.cpp
@@ -84,7 +84,7 @@ class Ilu : public ::testing::Test {
     std::shared_ptr<typename ilu_rev_prec_type::Factory> ilu_rev_pre_factory;
 };
 
-TYPED_TEST_SUITE(Ilu, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Ilu, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Ilu, BuildsDefaultWithoutThrowing)
diff --git a/reference/test/preconditioner/isai_kernels.cpp b/reference/test/preconditioner/isai_kernels.cpp
index 0164f5d8e58..a92a8c1fc5d 100644
--- a/reference/test/preconditioner/isai_kernels.cpp
+++ b/reference/test/preconditioner/isai_kernels.cpp
@@ -332,15 +332,15 @@ using HalfIndexTypes = gko::test::cartesian_type_product_t<
     gko::test::IndexTypes>;
 TYPED_TEST_SUITE(Isai, HalfIndexTypes, PairTypenameNameGenerator);
 #else
-TYPED_TEST_SUITE(Isai, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Isai, gko::test::ValueIndexTypesBase,
+                 PairTypenameNameGenerator);
 #endif
 
 
 #else
 
 
-TYPED_TEST_SUITE(Isai, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Isai, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 #endif
diff --git a/reference/test/preconditioner/jacobi.cpp b/reference/test/preconditioner/jacobi.cpp
index 2697efc3cd5..79c276579ad 100644
--- a/reference/test/preconditioner/jacobi.cpp
+++ b/reference/test/preconditioner/jacobi.cpp
@@ -144,8 +144,7 @@ class Jacobi : public ::testing::Test {
     std::unique_ptr<Bj> adaptive_bj;
 };
 
-TYPED_TEST_SUITE(Jacobi, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Jacobi, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Jacobi, GeneratesCorrectStorageScheme)
diff --git a/reference/test/preconditioner/jacobi_kernels.cpp b/reference/test/preconditioner/jacobi_kernels.cpp
index d5f9346eab6..cade7b3822a 100644
--- a/reference/test/preconditioner/jacobi_kernels.cpp
+++ b/reference/test/preconditioner/jacobi_kernels.cpp
@@ -86,8 +86,7 @@ class Jacobi : public ::testing::Test {
     std::shared_ptr<gko::matrix::Csr<value_type, index_type>> mtx;
 };
 
-TYPED_TEST_SUITE(Jacobi, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Jacobi, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Jacobi, CanBeGenerated)
diff --git a/reference/test/preconditioner/sor_kernels.cpp b/reference/test/preconditioner/sor_kernels.cpp
index cd2fa9af364..18c055aa6d9 100644
--- a/reference/test/preconditioner/sor_kernels.cpp
+++ b/reference/test/preconditioner/sor_kernels.cpp
@@ -55,8 +55,7 @@ class Sor : public ::testing::Test {
                                   exec);
 };
 
-TYPED_TEST_SUITE(Sor, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Sor, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Sor, CanInitializeLFactor)
diff --git a/reference/test/reorder/mc64.cpp b/reference/test/reorder/mc64.cpp
index 0670c77f6e2..f32e02aac07 100644
--- a/reference/test/reorder/mc64.cpp
+++ b/reference/test/reorder/mc64.cpp
@@ -71,8 +71,7 @@ class Mc64 : public ::testing::Test {
     std::unique_ptr<reorder_type> mc64_factory;
 };
 
-TYPED_TEST_SUITE(Mc64, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Mc64, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Mc64, HasSensibleDefaults)
diff --git a/reference/test/reorder/mc64_kernels.cpp b/reference/test/reorder/mc64_kernels.cpp
index f31bf7ba658..808b74df2d8 100644
--- a/reference/test/reorder/mc64_kernels.cpp
+++ b/reference/test/reorder/mc64_kernels.cpp
@@ -181,8 +181,7 @@ class Mc64 : public ::testing::Test {
     const real_type zero_tol;
 };
 
-TYPED_TEST_SUITE(Mc64, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Mc64, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Mc64, InitializeWeightsSum)
diff --git a/reference/test/reorder/rcm.cpp b/reference/test/reorder/rcm.cpp
index ae63ca504bb..ec547c141e3 100644
--- a/reference/test/reorder/rcm.cpp
+++ b/reference/test/reorder/rcm.cpp
@@ -54,8 +54,7 @@ class Rcm : public ::testing::Test {
     std::unique_ptr<reorder_type> reorder_op;
 };
 
-TYPED_TEST_SUITE(Rcm, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Rcm, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Rcm, CanBeCleared)
diff --git a/reference/test/reorder/scaled_reordered.cpp b/reference/test/reorder/scaled_reordered.cpp
index 8fb3c885cf3..4320ec35873 100644
--- a/reference/test/reorder/scaled_reordered.cpp
+++ b/reference/test/reorder/scaled_reordered.cpp
@@ -132,7 +132,7 @@ class ScaledReordered : public ::testing::Test {
     gko::remove_complex<value_type> tol;
 };
 
-TYPED_TEST_SUITE(ScaledReordered, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(ScaledReordered, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/solver/batch_bicgstab_kernels.cpp b/reference/test/solver/batch_bicgstab_kernels.cpp
index 468b38a561b..16d2f7a6653 100644
--- a/reference/test/solver/batch_bicgstab_kernels.cpp
+++ b/reference/test/solver/batch_bicgstab_kernels.cpp
@@ -75,7 +75,7 @@ class BatchBicgstab : public ::testing::Test {
         solve_lambda;
 };
 
-TYPED_TEST_SUITE(BatchBicgstab, gko::test::RealValueTypesWithHalf,
+TYPED_TEST_SUITE(BatchBicgstab, gko::test::RealValueTypes,
                  TypenameNameGenerator);
 
 
diff --git a/reference/test/solver/batch_cg_kernels.cpp b/reference/test/solver/batch_cg_kernels.cpp
index 2619614278e..86f8c1e84b0 100644
--- a/reference/test/solver/batch_cg_kernels.cpp
+++ b/reference/test/solver/batch_cg_kernels.cpp
@@ -75,8 +75,7 @@ class BatchCg : public ::testing::Test {
         solve_lambda;
 };
 
-TYPED_TEST_SUITE(BatchCg, gko::test::RealValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(BatchCg, gko::test::RealValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(BatchCg, SolvesStencilSystem)
diff --git a/reference/test/solver/bicg_kernels.cpp b/reference/test/solver/bicg_kernels.cpp
index a8f397aed1e..22b37683e0d 100644
--- a/reference/test/solver/bicg_kernels.cpp
+++ b/reference/test/solver/bicg_kernels.cpp
@@ -119,7 +119,7 @@ class Bicg : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> bicg_factory_non_symmetric;
 };
 
-TYPED_TEST_SUITE(Bicg, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Bicg, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Bicg, KernelInitialize)
diff --git a/reference/test/solver/bicgstab_kernels.cpp b/reference/test/solver/bicgstab_kernels.cpp
index 5bbff5b1a5e..7f508ae750a 100644
--- a/reference/test/solver/bicgstab_kernels.cpp
+++ b/reference/test/solver/bicgstab_kernels.cpp
@@ -121,8 +121,7 @@ class Bicgstab : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> bicgstab_factory_precision;
 };
 
-TYPED_TEST_SUITE(Bicgstab, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Bicgstab, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Bicgstab, KernelInitialize)
diff --git a/reference/test/solver/cb_gmres_kernels.cpp b/reference/test/solver/cb_gmres_kernels.cpp
index cee760f7840..2c6edc4abb1 100644
--- a/reference/test/solver/cb_gmres_kernels.cpp
+++ b/reference/test/solver/cb_gmres_kernels.cpp
@@ -137,9 +137,9 @@ using st_ir2 = st_helper_type<st_enum::ireduce2>;
 
 using TestTypes = gko::test::merge_type_list_t<
     gko::test::cartesian_type_product_t<
-        gko::test::ValueTypes, ::testing::Types<st_keep, st_r1, st_r2>>,
+        gko::test::ValueTypesBase, ::testing::Types<st_keep, st_r1, st_r2>>,
     gko::test::cartesian_type_product_t<
-        gko::test::RealValueTypes, ::testing::Types<st_i, st_ir1, st_ir2>>>;
+        gko::test::RealValueTypesBase, ::testing::Types<st_i, st_ir1, st_ir2>>>;
 
 TYPED_TEST_SUITE(CbGmres, TestTypes, PairTypenameNameGenerator);
 
diff --git a/reference/test/solver/cg_kernels.cpp b/reference/test/solver/cg_kernels.cpp
index 8cbc9a09c18..c4987bb5b17 100644
--- a/reference/test/solver/cg_kernels.cpp
+++ b/reference/test/solver/cg_kernels.cpp
@@ -107,7 +107,7 @@ class Cg : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> cg_factory_big2;
 };
 
-TYPED_TEST_SUITE(Cg, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Cg, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Cg, KernelInitialize)
diff --git a/reference/test/solver/cgs_kernels.cpp b/reference/test/solver/cgs_kernels.cpp
index c51a3252540..a631c0c4944 100644
--- a/reference/test/solver/cgs_kernels.cpp
+++ b/reference/test/solver/cgs_kernels.cpp
@@ -121,7 +121,7 @@ class Cgs : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> cgs_factory_big2;
 };
 
-TYPED_TEST_SUITE(Cgs, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Cgs, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Cgs, KernelInitialize)
diff --git a/reference/test/solver/direct.cpp b/reference/test/solver/direct.cpp
index e421811382f..d06948e631e 100644
--- a/reference/test/solver/direct.cpp
+++ b/reference/test/solver/direct.cpp
@@ -66,8 +66,7 @@ class Direct : public ::testing::Test {
     std::unique_ptr<solver_type> solver;
 };
 
-TYPED_TEST_SUITE(Direct, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Direct, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(Direct, SolvesAni1SingleRhs)
diff --git a/reference/test/solver/fcg_kernels.cpp b/reference/test/solver/fcg_kernels.cpp
index 4b8484a78c8..dca202f9fc8 100644
--- a/reference/test/solver/fcg_kernels.cpp
+++ b/reference/test/solver/fcg_kernels.cpp
@@ -112,7 +112,7 @@ class Fcg : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> fcg_factory_big2;
 };
 
-TYPED_TEST_SUITE(Fcg, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Fcg, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Fcg, KernelInitialize)
diff --git a/reference/test/solver/gcr_kernels.cpp b/reference/test/solver/gcr_kernels.cpp
index be747a2f84b..701a6590ec1 100644
--- a/reference/test/solver/gcr_kernels.cpp
+++ b/reference/test/solver/gcr_kernels.cpp
@@ -119,7 +119,7 @@ class Gcr : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> gcr_factory_big2;
 };
 
-TYPED_TEST_SUITE(Gcr, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Gcr, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Gcr, KernelInitialize)
diff --git a/reference/test/solver/gmres_kernels.cpp b/reference/test/solver/gmres_kernels.cpp
index 1719dfe1062..93d2d79e624 100644
--- a/reference/test/solver/gmres_kernels.cpp
+++ b/reference/test/solver/gmres_kernels.cpp
@@ -136,7 +136,7 @@ class Gmres : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> gmres_factory_big2;
 };
 
-TYPED_TEST_SUITE(Gmres, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Gmres, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Gmres, KernelInitialize)
diff --git a/reference/test/solver/idr_kernels.cpp b/reference/test/solver/idr_kernels.cpp
index a5aee44029c..7f171530086 100644
--- a/reference/test/solver/idr_kernels.cpp
+++ b/reference/test/solver/idr_kernels.cpp
@@ -60,7 +60,7 @@ class Idr : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> idr_factory_precision;
 };
 
-TYPED_TEST_SUITE(Idr, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Idr, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Idr, SolvesDenseSystem)
diff --git a/reference/test/solver/ir_kernels.cpp b/reference/test/solver/ir_kernels.cpp
index fc14711bec2..b0c1029f693 100644
--- a/reference/test/solver/ir_kernels.cpp
+++ b/reference/test/solver/ir_kernels.cpp
@@ -47,7 +47,7 @@ class Ir : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> ir_factory;
 };
 
-TYPED_TEST_SUITE(Ir, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Ir, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(Ir, KernelInitialize)
diff --git a/reference/test/solver/lower_trs.cpp b/reference/test/solver/lower_trs.cpp
index fd6fe1e4b16..d52ee028b53 100644
--- a/reference/test/solver/lower_trs.cpp
+++ b/reference/test/solver/lower_trs.cpp
@@ -45,7 +45,7 @@ class LowerTrs : public ::testing::Test {
     std::unique_ptr<Solver> solver;
 };
 
-TYPED_TEST_SUITE(LowerTrs, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(LowerTrs, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/solver/lower_trs_kernels.cpp b/reference/test/solver/lower_trs_kernels.cpp
index dcb7d6c6f0c..3680f19681f 100644
--- a/reference/test/solver/lower_trs_kernels.cpp
+++ b/reference/test/solver/lower_trs_kernels.cpp
@@ -75,7 +75,7 @@ class LowerTrs : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> lower_trs_factory_unit;
 };
 
-TYPED_TEST_SUITE(LowerTrs, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(LowerTrs, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/solver/multigrid_kernels.cpp b/reference/test/solver/multigrid_kernels.cpp
index 31c27a4551a..9f18c264826 100644
--- a/reference/test/solver/multigrid_kernels.cpp
+++ b/reference/test/solver/multigrid_kernels.cpp
@@ -415,7 +415,7 @@ class Multigrid : public ::testing::Test {
     std::shared_ptr<Mtx> x2;
 };
 
-TYPED_TEST_SUITE(Multigrid, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(Multigrid, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/solver/upper_trs.cpp b/reference/test/solver/upper_trs.cpp
index b59744a0e8c..9980c51f9d1 100644
--- a/reference/test/solver/upper_trs.cpp
+++ b/reference/test/solver/upper_trs.cpp
@@ -45,7 +45,7 @@ class UpperTrs : public ::testing::Test {
     std::unique_ptr<Solver> upper_trs_solver;
 };
 
-TYPED_TEST_SUITE(UpperTrs, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(UpperTrs, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/solver/upper_trs_kernels.cpp b/reference/test/solver/upper_trs_kernels.cpp
index 15f0f3c2996..a60f3b46079 100644
--- a/reference/test/solver/upper_trs_kernels.cpp
+++ b/reference/test/solver/upper_trs_kernels.cpp
@@ -75,7 +75,7 @@ class UpperTrs : public ::testing::Test {
     std::unique_ptr<typename Solver::Factory> upper_trs_factory_unit;
 };
 
-TYPED_TEST_SUITE(UpperTrs, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(UpperTrs, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/reference/test/stop/residual_norm_kernels.cpp b/reference/test/stop/residual_norm_kernels.cpp
index aed801afacf..e7eef0565d2 100644
--- a/reference/test/stop/residual_norm_kernels.cpp
+++ b/reference/test/stop/residual_norm_kernels.cpp
@@ -45,8 +45,7 @@ class ResidualNorm : public ::testing::Test {
     std::shared_ptr<const gko::Executor> exec_;
 };
 
-TYPED_TEST_SUITE(ResidualNorm, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(ResidualNorm, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(ResidualNorm, CanCreateFactory)
@@ -530,7 +529,7 @@ class ResidualNormWithInitialResnorm : public ::testing::Test {
     std::shared_ptr<const gko::ReferenceExecutor> exec_;
 };
 
-TYPED_TEST_SUITE(ResidualNormWithInitialResnorm, gko::test::ValueTypesWithHalf,
+TYPED_TEST_SUITE(ResidualNormWithInitialResnorm, gko::test::ValueTypes,
                  TypenameNameGenerator);
 
 
@@ -671,7 +670,7 @@ class ResidualNormWithRhsNorm : public ::testing::Test {
     std::shared_ptr<const gko::Executor> exec_;
 };
 
-TYPED_TEST_SUITE(ResidualNormWithRhsNorm, gko::test::ValueTypesWithHalf,
+TYPED_TEST_SUITE(ResidualNormWithRhsNorm, gko::test::ValueTypes,
                  TypenameNameGenerator);
 
 
@@ -808,7 +807,7 @@ class ImplicitResidualNorm : public ::testing::Test {
     std::shared_ptr<const gko::Executor> exec_;
 };
 
-TYPED_TEST_SUITE(ImplicitResidualNorm, gko::test::ValueTypesWithHalf,
+TYPED_TEST_SUITE(ImplicitResidualNorm, gko::test::ValueTypes,
                  TypenameNameGenerator);
 
 
@@ -984,7 +983,7 @@ class ResidualNormWithAbsolute : public ::testing::Test {
     std::shared_ptr<const gko::Executor> exec_;
 };
 
-TYPED_TEST_SUITE(ResidualNormWithAbsolute, gko::test::ValueTypesWithHalf,
+TYPED_TEST_SUITE(ResidualNormWithAbsolute, gko::test::ValueTypes,
                  TypenameNameGenerator);
 
 
diff --git a/reference/test/utils/assertions_test.cpp b/reference/test/utils/assertions_test.cpp
index 9c6b544172e..98f1ec68e0d 100644
--- a/reference/test/utils/assertions_test.cpp
+++ b/reference/test/utils/assertions_test.cpp
@@ -17,8 +17,7 @@ namespace {
 template <typename T>
 class MatricesNear : public ::testing::Test {};
 
-TYPED_TEST_SUITE(MatricesNear, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(MatricesNear, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(MatricesNear, CanPassAnyMatrixType)
diff --git a/test/base/device_matrix_data_kernels.cpp b/test/base/device_matrix_data_kernels.cpp
index d2543ae7cbb..189badf83fa 100644
--- a/test/base/device_matrix_data_kernels.cpp
+++ b/test/base/device_matrix_data_kernels.cpp
@@ -84,7 +84,7 @@ class DeviceMatrixData : public CommonTestFixture {
     gko::matrix_data<value_type, index_type> deduplicated_data;
 };
 
-TYPED_TEST_SUITE(DeviceMatrixData, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(DeviceMatrixData, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/test/components/fill_array_kernels.cpp b/test/components/fill_array_kernels.cpp
index 4237a75304a..3d494b3f5f0 100644
--- a/test/components/fill_array_kernels.cpp
+++ b/test/components/fill_array_kernels.cpp
@@ -36,7 +36,7 @@ class FillArray : public CommonTestFixture {
     gko::array<value_type> seqs;
 };
 
-TYPED_TEST_SUITE(FillArray, gko::test::ComplexAndPODTypesWithHalf,
+TYPED_TEST_SUITE(FillArray, gko::test::ComplexAndPODTypes,
                  TypenameNameGenerator);
 
 
diff --git a/test/components/reduce_array_kernels.cpp b/test/components/reduce_array_kernels.cpp
index 7940feec661..00a634377ec 100644
--- a/test/components/reduce_array_kernels.cpp
+++ b/test/components/reduce_array_kernels.cpp
@@ -43,7 +43,7 @@ class ReduceArray : public CommonTestFixture {
     gko::array<value_type> dvals;
 };
 
-TYPED_TEST_SUITE(ReduceArray, gko::test::ComplexAndPODTypesWithHalf,
+TYPED_TEST_SUITE(ReduceArray, gko::test::ComplexAndPODTypes,
                  TypenameNameGenerator);
 
 
diff --git a/test/distributed/assembly_kernels.cpp b/test/distributed/assembly_kernels.cpp
index d1e2f708ca6..4ab4c9173ac 100644
--- a/test/distributed/assembly_kernels.cpp
+++ b/test/distributed/assembly_kernels.cpp
@@ -100,7 +100,7 @@ class AssemblyHelpers : public CommonTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(AssemblyHelpers, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(AssemblyHelpers, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/test/distributed/matrix_kernels.cpp b/test/distributed/matrix_kernels.cpp
index ad91d699496..9a5d4f2cf7b 100644
--- a/test/distributed/matrix_kernels.cpp
+++ b/test/distributed/matrix_kernels.cpp
@@ -87,7 +87,7 @@ class Matrix : public CommonTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(Matrix, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(Matrix, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/test/distributed/vector_kernels.cpp b/test/distributed/vector_kernels.cpp
index 1246da9a116..a212699a2ca 100644
--- a/test/distributed/vector_kernels.cpp
+++ b/test/distributed/vector_kernels.cpp
@@ -67,7 +67,7 @@ class Vector : public CommonTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(Vector, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(Vector, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/test/factorization/cholesky_kernels.cpp b/test/factorization/cholesky_kernels.cpp
index 007f3cbf6fd..1b2d187c785 100644
--- a/test/factorization/cholesky_kernels.cpp
+++ b/test/factorization/cholesky_kernels.cpp
@@ -111,15 +111,15 @@ class CholeskySymbolic : public CommonTestFixture {
 };
 
 #ifdef GKO_COMPILING_OMP
-using Types = gko::test::ValueIndexTypes;
+using Types = gko::test::ValueIndexTypesBase;
 #elif defined(GKO_COMPILING_CUDA)
 // CUDA doesn't support long indices for sorting, and the triangular solvers
 // seem broken
-using Types = gko::test::cartesian_type_product_t<gko::test::ValueTypesWithHalf,
+using Types = gko::test::cartesian_type_product_t<gko::test::ValueTypes,
                                                   ::testing::Types<gko::int32>>;
 #else
 // HIP only supports real types and int32
-using Types = gko::test::cartesian_type_product_t<gko::test::RealValueTypes,
+using Types = gko::test::cartesian_type_product_t<gko::test::RealValueTypesBase,
                                                   ::testing::Types<gko::int32>>;
 #endif
 
diff --git a/test/factorization/lu_kernels.cpp b/test/factorization/lu_kernels.cpp
index 59f3cb30327..4fe974200dc 100644
--- a/test/factorization/lu_kernels.cpp
+++ b/test/factorization/lu_kernels.cpp
@@ -129,15 +129,15 @@ class Lu : public CommonTestFixture {
 };
 
 #ifdef GKO_COMPILING_OMP
-using Types = gko::test::ValueIndexTypesWithHalf;
+using Types = gko::test::ValueIndexTypes;
 #elif defined(GKO_COMPILING_CUDA)
 // CUDA don't support long indices for sorting, and the triangular solvers
 // seem broken
-using Types = gko::test::cartesian_type_product_t<gko::test::ValueTypesWithHalf,
+using Types = gko::test::cartesian_type_product_t<gko::test::ValueTypes,
                                                   ::testing::Types<gko::int32>>;
 #else
 // HIP only supports real types and int32
-using Types = gko::test::cartesian_type_product_t<gko::test::RealValueTypes,
+using Types = gko::test::cartesian_type_product_t<gko::test::RealValueTypesBase,
                                                   ::testing::Types<gko::int32>>;
 #endif
 
diff --git a/test/factorization/par_ic_kernels.cpp b/test/factorization/par_ic_kernels.cpp
index 10eccb83f10..36a20dda48f 100644
--- a/test/factorization/par_ic_kernels.cpp
+++ b/test/factorization/par_ic_kernels.cpp
@@ -86,8 +86,7 @@ class ParIc : public CommonTestFixture {
     std::unique_ptr<Csr> dmtx_l_ani_init;
 };
 
-TYPED_TEST_SUITE(ParIc, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIc, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIc, KernelInitFactorIsEquivalentToRef)
diff --git a/test/factorization/par_ict_kernels.cpp b/test/factorization/par_ict_kernels.cpp
index 8d6579d584e..7362929a450 100644
--- a/test/factorization/par_ict_kernels.cpp
+++ b/test/factorization/par_ict_kernels.cpp
@@ -93,8 +93,7 @@ class ParIct : public CommonTestFixture {
     std::unique_ptr<Csr> dmtx_l;
 };
 
-TYPED_TEST_SUITE(ParIct, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIct, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIct, KernelAddCandidatesIsEquivalentToRef)
diff --git a/test/factorization/par_ilu_kernels.cpp b/test/factorization/par_ilu_kernels.cpp
index 8c3ab20a674..116790c2b36 100644
--- a/test/factorization/par_ilu_kernels.cpp
+++ b/test/factorization/par_ilu_kernels.cpp
@@ -144,8 +144,7 @@ class ParIlu : public CommonTestFixture {
     }
 };
 
-TYPED_TEST_SUITE(ParIlu, gko::test::ValueIndexTypesWithHalf,
-                 PairTypenameNameGenerator);
+TYPED_TEST_SUITE(ParIlu, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
 
 
 TYPED_TEST(ParIlu, KernelAddDiagonalElementsSortedEquivalentToRef)
diff --git a/test/factorization/par_ilut_kernels.cpp b/test/factorization/par_ilut_kernels.cpp
index b1af2b4c748..c7a8e254567 100644
--- a/test/factorization/par_ilut_kernels.cpp
+++ b/test/factorization/par_ilut_kernels.cpp
@@ -233,7 +233,7 @@ class ParIlut : public CommonTestFixture {
     std::unique_ptr<Csr> dmtx_u;
 };
 
-TYPED_TEST_SUITE(ParIlut, gko::test::ValueIndexTypesWithHalf,
+TYPED_TEST_SUITE(ParIlut, gko::test::ValueIndexTypes,
                  PairTypenameNameGenerator);
 
 
diff --git a/test/matrix/fbcsr_kernels.cpp b/test/matrix/fbcsr_kernels.cpp
index 5e3d4b1a112..72dcc67e005 100644
--- a/test/matrix/fbcsr_kernels.cpp
+++ b/test/matrix/fbcsr_kernels.cpp
@@ -61,10 +61,9 @@ class Fbcsr : public CommonTestFixture {
 };
 
 #ifdef GKO_COMPILING_HIP
-TYPED_TEST_SUITE(Fbcsr, gko::test::RealValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(Fbcsr, gko::test::RealValueTypes, TypenameNameGenerator);
 #else
-TYPED_TEST_SUITE(Fbcsr, gko::test::ValueTypesWithHalf, TypenameNameGenerator);
+TYPED_TEST_SUITE(Fbcsr, gko::test::ValueTypes, TypenameNameGenerator);
 #endif
 
 TYPED_TEST(Fbcsr, CanWriteFromMatrixOnDevice)
diff --git a/test/matrix/fft_kernels.cpp b/test/matrix/fft_kernels.cpp
index 5b2c33085e3..97f043a1fb4 100644
--- a/test/matrix/fft_kernels.cpp
+++ b/test/matrix/fft_kernels.cpp
@@ -91,7 +91,7 @@ class Fft : public CommonTestFixture {
 };
 
 
-TYPED_TEST_SUITE(Fft, gko::test::ComplexValueTypes, TypenameNameGenerator);
+TYPED_TEST_SUITE(Fft, gko::test::ComplexValueTypesBase, TypenameNameGenerator);
 
 
 TYPED_TEST(Fft, Apply1DIsEqualToReference)
diff --git a/test/mpi/assembly.cpp b/test/mpi/assembly.cpp
index 9db0eab553a..3ad47565d44 100644
--- a/test/mpi/assembly.cpp
+++ b/test/mpi/assembly.cpp
@@ -83,7 +83,7 @@ class AssemblyHelpers : public CommonMpiTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(AssemblyHelpers, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(AssemblyHelpers, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/test/mpi/matrix.cpp b/test/mpi/matrix.cpp
index 85e0a43d146..e761aab159e 100644
--- a/test/mpi/matrix.cpp
+++ b/test/mpi/matrix.cpp
@@ -101,7 +101,7 @@ class MatrixCreation : public CommonMpiTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(MatrixCreation, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(MatrixCreation, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
@@ -467,7 +467,7 @@ class Matrix : public CommonMpiTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(Matrix, gko::test::ValueTypes, TypenameNameGenerator);
+TYPED_TEST_SUITE(Matrix, gko::test::ValueTypesBase, TypenameNameGenerator);
 
 
 TYPED_TEST(Matrix, CanApplyToSingleVector)
diff --git a/test/mpi/multigrid/pgm.cpp b/test/mpi/multigrid/pgm.cpp
index 664ad0cd4ec..df198f235c3 100644
--- a/test/mpi/multigrid/pgm.cpp
+++ b/test/mpi/multigrid/pgm.cpp
@@ -80,7 +80,7 @@ class Pgm : public CommonMpiTestFixture {
     std::shared_ptr<dist_mtx_type> dist_mat;
 };
 
-TYPED_TEST_SUITE(Pgm, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(Pgm, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
diff --git a/test/mpi/preconditioner/schwarz.cpp b/test/mpi/preconditioner/schwarz.cpp
index 6717cd9d888..113f8922aae 100644
--- a/test/mpi/preconditioner/schwarz.cpp
+++ b/test/mpi/preconditioner/schwarz.cpp
@@ -143,7 +143,8 @@ class SchwarzPreconditioner : public CommonMpiTestFixture {
     }
 };
 
-TYPED_TEST_SUITE(SchwarzPreconditioner, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(SchwarzPreconditioner,
+                 gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 TYPED_TEST(SchwarzPreconditioner, GenerateFailsIfInvalidState)
diff --git a/test/mpi/vector.cpp b/test/mpi/vector.cpp
index 53990650ed7..752342a8e64 100644
--- a/test/mpi/vector.cpp
+++ b/test/mpi/vector.cpp
@@ -95,7 +95,7 @@ class VectorCreation : public CommonMpiTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(VectorCreation, gko::test::ValueLocalGlobalIndexTypes,
+TYPED_TEST_SUITE(VectorCreation, gko::test::ValueLocalGlobalIndexTypesBase,
                  TupleTypenameNameGenerator);
 
 
@@ -361,7 +361,7 @@ class VectorCreationHelpers : public CommonMpiTestFixture {
     std::unique_ptr<vec_type> dst;
 };
 
-TYPED_TEST_SUITE(VectorCreationHelpers, gko::test::ValueTypes,
+TYPED_TEST_SUITE(VectorCreationHelpers, gko::test::ValueTypesBase,
                  TypenameNameGenerator);
 
 
@@ -513,7 +513,7 @@ class VectorReductions : public CommonMpiTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(VectorReductions, gko::test::ValueTypes,
+TYPED_TEST_SUITE(VectorReductions, gko::test::ValueTypesBase,
                  TypenameNameGenerator);
 
 
@@ -801,7 +801,8 @@ class VectorLocalOps : public CommonMpiTestFixture {
     std::default_random_engine engine;
 };
 
-TYPED_TEST_SUITE(VectorLocalOps, gko::test::ValueTypes, TypenameNameGenerator);
+TYPED_TEST_SUITE(VectorLocalOps, gko::test::ValueTypesBase,
+                 TypenameNameGenerator);
 
 
 TYPED_TEST(VectorLocalOps, ApplyNotSupported)
diff --git a/test/reorder/amd.cpp b/test/reorder/amd.cpp
index a1ca7c09359..bbaf88b2a4e 100644
--- a/test/reorder/amd.cpp
+++ b/test/reorder/amd.cpp
@@ -40,7 +40,8 @@ class Amd : public CommonTestFixture {
     std::shared_ptr<matrix_type> dmtx;
 };
 
-TYPED_TEST_SUITE(Amd, gko::test::ValueIndexTypes, PairTypenameNameGenerator);
+TYPED_TEST_SUITE(Amd, gko::test::ValueIndexTypesBase,
+                 PairTypenameNameGenerator);
 
 
 TYPED_TEST(Amd, IsEquivalentToRef)
diff --git a/test/solver/direct.cpp b/test/solver/direct.cpp
index 1ee95806c37..c00fa772c14 100644
--- a/test/solver/direct.cpp
+++ b/test/solver/direct.cpp
@@ -100,15 +100,15 @@ class Direct : public CommonTestFixture {
 };
 
 #ifdef GKO_COMPILING_OMP
-using Types = gko::test::ValueIndexTypesWithHalf;
+using Types = gko::test::ValueIndexTypes;
 #elif defined(GKO_COMPILING_CUDA)
 // CUDA don't support long indices for sorting, and the triangular solvers
 // seem broken
-using Types = gko::test::cartesian_type_product_t<gko::test::ValueTypes,
+using Types = gko::test::cartesian_type_product_t<gko::test::ValueTypesBase,
                                                   ::testing::Types<gko::int32>>;
 #else
 // HIP only supports real types and int32
-using Types = gko::test::cartesian_type_product_t<gko::test::RealValueTypes,
+using Types = gko::test::cartesian_type_product_t<gko::test::RealValueTypesBase,
                                                   ::testing::Types<gko::int32>>;
 #endif
 
diff --git a/test/stop/residual_norm_kernels.cpp b/test/stop/residual_norm_kernels.cpp
index 62f656bed59..7be3e7fde48 100644
--- a/test/stop/residual_norm_kernels.cpp
+++ b/test/stop/residual_norm_kernels.cpp
@@ -58,8 +58,7 @@ class ResidualNorm : public CommonTestFixture {
     std::unique_ptr<typename gko::stop::ResidualNorm<T>::Factory> abs_factory;
 };
 
-TYPED_TEST_SUITE(ResidualNorm, gko::test::ValueTypesWithHalf,
-                 TypenameNameGenerator);
+TYPED_TEST_SUITE(ResidualNorm, gko::test::ValueTypes, TypenameNameGenerator);
 
 
 TYPED_TEST(ResidualNorm, CanIgorneResidualNorm)
@@ -345,7 +344,7 @@ class ResidualNormWithInitialResnorm : public CommonTestFixture {
     std::unique_ptr<typename gko::stop::ResidualNorm<T>::Factory> factory;
 };
 
-TYPED_TEST_SUITE(ResidualNormWithInitialResnorm, gko::test::ValueTypesWithHalf,
+TYPED_TEST_SUITE(ResidualNormWithInitialResnorm, gko::test::ValueTypes,
                  TypenameNameGenerator);
 
 
@@ -442,7 +441,7 @@ class ResidualNormWithRhsNorm : public CommonTestFixture {
     std::unique_ptr<typename gko::stop::ResidualNorm<T>::Factory> factory;
 };
 
-TYPED_TEST_SUITE(ResidualNormWithRhsNorm, gko::test::ValueTypesWithHalf,
+TYPED_TEST_SUITE(ResidualNormWithRhsNorm, gko::test::ValueTypes,
                  TypenameNameGenerator);
 
 
@@ -547,7 +546,7 @@ class ImplicitResidualNorm : public CommonTestFixture {
         factory;
 };
 
-TYPED_TEST_SUITE(ImplicitResidualNorm, gko::test::ValueTypesWithHalf,
+TYPED_TEST_SUITE(ImplicitResidualNorm, gko::test::ValueTypes,
                  TypenameNameGenerator);
 
 
@@ -693,7 +692,7 @@ class ResidualNormWithAbsolute : public CommonTestFixture {
     std::unique_ptr<typename gko::stop::ResidualNorm<T>::Factory> factory;
 };
 
-TYPED_TEST_SUITE(ResidualNormWithAbsolute, gko::test::ValueTypesWithHalf,
+TYPED_TEST_SUITE(ResidualNormWithAbsolute, gko::test::ValueTypes,
                  TypenameNameGenerator);