diff --git a/tests/layers_test.cc b/tests/layers_test.cc
index cbbaa2d72..0ff925468 100644
--- a/tests/layers_test.cc
+++ b/tests/layers_test.cc
@@ -261,7 +261,7 @@ TEST(LayerTest, PositionEncoderNoSharedState) {
 INSTANTIATE_TEST_SUITE_P(CPU, LayerDeviceFPTest,
                          ::testing::Values(FloatType{Device::CPU, DataType::FLOAT32, 1e-5}),
                          fp_test_name);
-#ifdef CT2_WITH_CUDA
+#if defined(CT2_WITH_CUDA) || defined(CT2_USE_HIP)
 INSTANTIATE_TEST_SUITE_P(CUDA, LayerDeviceFPTest,
                          ::testing::Values(FloatType{Device::CUDA, DataType::FLOAT32, 1e-5},
                                            FloatType{Device::CUDA, DataType::FLOAT16, 1e-2},
diff --git a/tests/ops_test.cc b/tests/ops_test.cc
index cf0a7cc6b..a50d2b934 100644
--- a/tests/ops_test.cc
+++ b/tests/ops_test.cc
@@ -1414,7 +1414,7 @@ INSTANTIATE_TEST_SUITE_P(CPU, OpDeviceTest, ::testing::Values(Device::CPU));
 INSTANTIATE_TEST_SUITE_P(CPU, OpDeviceFPTest,
                          ::testing::Values(FloatType{Device::CPU, DataType::FLOAT32, 1e-5}),
                          fp_test_name);
-#ifdef CT2_WITH_CUDA
+#if defined(CT2_WITH_CUDA) || defined(CT2_USE_HIP)
 INSTANTIATE_TEST_SUITE_P(CUDA, OpDeviceTest, ::testing::Values(Device::CUDA));
 INSTANTIATE_TEST_SUITE_P(CUDA, OpDeviceFPTest,
                          ::testing::Values(FloatType{Device::CUDA, DataType::FLOAT32, 1e-5},
diff --git a/tests/primitives_test.cc b/tests/primitives_test.cc
index 9f603de33..7fd0d3014 100644
--- a/tests/primitives_test.cc
+++ b/tests/primitives_test.cc
@@ -52,6 +52,6 @@ TEST_P(PrimitiveTest, PenalizePreviousTokens) {
 }
 
 INSTANTIATE_TEST_SUITE_P(CPU, PrimitiveTest, ::testing::Values(Device::CPU));
-#ifdef CT2_WITH_CUDA
+#if defined(CT2_WITH_CUDA) || defined(CT2_USE_HIP)
 INSTANTIATE_TEST_SUITE_P(CUDA, PrimitiveTest, ::testing::Values(Device::CUDA));
 #endif
diff --git a/tests/storage_view_test.cc b/tests/storage_view_test.cc
index bc6da8825..0933c0105 100644
--- a/tests/storage_view_test.cc
+++ b/tests/storage_view_test.cc
@@ -75,6 +75,6 @@ TEST_P(StorageViewDeviceTest, HalfConversion) {
 }
 
 INSTANTIATE_TEST_SUITE_P(CPU, StorageViewDeviceTest, ::testing::Values(Device::CPU));
-#ifdef CT2_WITH_CUDA
+#if defined(CT2_WITH_CUDA) || defined(CT2_USE_HIP)
 INSTANTIATE_TEST_SUITE_P(CUDA, StorageViewDeviceTest, ::testing::Values(Device::CUDA));
 #endif
diff --git a/tests/translator_test.cc b/tests/translator_test.cc
index c3edc3b5f..9a8006301 100644
--- a/tests/translator_test.cc
+++ b/tests/translator_test.cc
@@ -715,7 +715,7 @@ TEST_P(BiasedDecodingDeviceFPTest, NonZeroTimestepDiverge) {
 INSTANTIATE_TEST_SUITE_P(CPU, BiasedDecodingDeviceFPTest,
                          ::testing::Values(FloatType{Device::CPU, DataType::FLOAT32}),
                          fp_test_name);
-#ifdef CT2_WITH_CUDA
+#if defined(CT2_WITH_CUDA) || defined(CT2_USE_HIP)
 INSTANTIATE_TEST_SUITE_P(CUDA, BiasedDecodingDeviceFPTest,
                          ::testing::Values(FloatType{Device::CUDA, DataType::FLOAT32},
                                            FloatType{Device::CUDA, DataType::FLOAT16}),