diff --git a/.gitignore b/.gitignore
index ba39cc53..ced94deb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Manifest.toml
+Manifest-*.toml
diff --git a/test/array.jl b/test/array.jl
index afe97e23..f4ee531b 100644
--- a/test/array.jl
+++ b/test/array.jl
@@ -49,7 +49,7 @@ import Adapt
     end
     # TODO: Look into how to port the @sync
 
-    if cl.memory_backend() isa cl.USMBackend
+    if cl.USMBackend() in cl.supported_memory_backends(cl.device())
         @testset "shared buffers & unsafe_wrap" begin
             a = CLVector{Int, cl.UnifiedSharedMemory}(undef, 2)
 
diff --git a/test/buffer.jl b/test/buffer.jl
index 7260215a..0b4b10c2 100644
--- a/test/buffer.jl
+++ b/test/buffer.jl
@@ -74,7 +74,7 @@
     end
 end
 
-if cl.memory_backend() isa cl.SVMBackend
+if cl.SVMBackend() in cl.supported_memory_backends(cl.device())
 @testset "SVM Buffer" begin
     # simple buffer
     let buf = cl.svm_alloc(sizeof(Int))