diff --git a/bob/bio/face/test/test_baselines.py b/bob/bio/face/test/test_baselines.py
index 3fc649ec28dc68c7f37172be41f3fe610b9bef47..ab1892d81181931c54414e57c95107a95bdbded2 100644
--- a/bob/bio/face/test/test_baselines.py
+++ b/bob/bio/face/test/test_baselines.py
@@ -13,7 +13,7 @@ import bob.io.base
 import functools
 import copy
 
-from bob.bio.base.test.utils import mxnet_available, tensorflow_available
+from bob.bio.base.test.utils import is_library_available
 
 images = dict()
 images["bioref"] = (
@@ -106,32 +106,32 @@ def run_baseline(baseline, samples_for_training=[]):
         assert "scores" in dirs
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_facenet_baseline():
     run_baseline("facenet-sanderberg")
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_inception_resnetv2_msceleb():
     run_baseline("inception-resnetv2-msceleb")
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_inception_resnetv2_casiawebface():
     run_baseline("inception-resnetv2-casiawebface")
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_inception_resnetv1_msceleb():
     run_baseline("inception-resnetv1-msceleb")
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_inception_resnetv1_casiawebface():
     run_baseline("inception-resnetv1-casiawebface")
 
 
-@mxnet_available
+@is_library_available("mxnet")
 def test_arcface_insightface():
     run_baseline("arcface-insightface")
 
diff --git a/bob/bio/face/test/test_embeddings.py b/bob/bio/face/test/test_embeddings.py
index 2d316dc1369b7d391d44a6b0a6207c6631a78ef6..0cd7a7be68cddb9f1f1b92ef19b011b792365f69 100644
--- a/bob/bio/face/test/test_embeddings.py
+++ b/bob/bio/face/test/test_embeddings.py
@@ -3,10 +3,10 @@ import bob.io.base
 import numpy as np
 from bob.pipelines import Sample, wrap
 import pkg_resources
-from bob.bio.base.test.utils import mxnet_available, tensorflow_available
+from bob.bio.base.test.utils import is_library_available
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_idiap_inceptionv2_msceleb():
     from bob.bio.face.embeddings import InceptionResnetv2_MsCeleb_CenterLoss_2018
 
@@ -30,7 +30,7 @@ def test_idiap_inceptionv2_msceleb():
     assert output.size == 128, output.shape
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_idiap_inceptionv2_casia():
     from bob.bio.face.embeddings import InceptionResnetv2_Casia_CenterLoss_2018
 
@@ -48,7 +48,7 @@ def test_idiap_inceptionv2_casia():
     assert output.size == 128, output.shape
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_idiap_inceptionv1_msceleb():
     from bob.bio.face.embeddings import InceptionResnetv1_MsCeleb_CenterLoss_2018
 
@@ -66,7 +66,7 @@ def test_idiap_inceptionv1_msceleb():
     assert output.size == 128, output.shape
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_idiap_inceptionv1_casia():
     from bob.bio.face.embeddings import InceptionResnetv1_Casia_CenterLoss_2018
 
@@ -84,7 +84,7 @@ def test_idiap_inceptionv1_casia():
     assert output.size == 128, output.shape
 
 
-@tensorflow_available
+@is_library_available("tensorflow")
 def test_facenet_sanderberg():
     from bob.bio.face.embeddings import FaceNetSanderberg_20170512_110547
 
@@ -101,7 +101,7 @@ def test_facenet_sanderberg():
     assert output.size == 128, output.shape
 
 
-@mxnet_available
+@is_library_available("mxnet")
 def test_arcface_insight_face():
     from bob.bio.face.embeddings import ArcFaceInsightFace