diff --git a/tests/testing_zgemm_dtd.c b/tests/testing_zgemm_dtd.c
index fb11a847..c8403566 100644
--- a/tests/testing_zgemm_dtd.c
+++ b/tests/testing_zgemm_dtd.c
@@ -124,6 +124,12 @@ int main(int argc, char ** argv)
         parsec_task_class_t *zgemm_tc = parsec_dtd_create_zgemm_task_class(dtd_tp, TILE_FULL, PARSEC_DEV_ALL);
 
 #if defined(DPLASMA_HAVE_CUDA)
+        gpus = parsec_mca_device_enabled();
+        for( int i = 0; i < parsec_mca_device_enabled(); i++ ) {
+            if( parsec_mca_device_get(i)->type != PARSEC_DEV_CUDA) {
+                gpus--;
+            }
+        }
         if( gpus > 0 ){
             CuHI = parsec_info_lookup(&parsec_per_stream_infos, "DPLASMA::CUDA::HANDLES", NULL);
             assert( CuHI != -1);
diff --git a/tests/testing_zpotrf_dtd.c b/tests/testing_zpotrf_dtd.c
index 423f1cf8..027f4805 100644
--- a/tests/testing_zpotrf_dtd.c
+++ b/tests/testing_zpotrf_dtd.c
@@ -96,7 +96,13 @@ int main(int argc, char **argv)
 
 #if defined(DPLASMA_HAVE_CUDA)
     zpotrf_dtd_workspace_info_t* infos = (zpotrf_dtd_workspace_info_t*) malloc(sizeof(zpotrf_dtd_workspace_info_t));
-    if( gpus > 0 ){
+    gpus = parsec_mca_device_enabled();
+    for( int i = 0; i < parsec_mca_device_enabled(); i++ ) {
+        if( parsec_mca_device_get(i)->type != PARSEC_DEV_CUDA) {
+            gpus--;
+        }
+    }
+    if( gpus > 0 ) {
         CuHI = parsec_info_lookup(&parsec_per_stream_infos, "DPLASMA::CUDA::HANDLES", NULL);
         assert(CuHI != -1);
     }