diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2f7702fb7..66ab56e2a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -42,11 +42,13 @@ steps:
       queue: "juliagpu"
       rocm: "*"
       rocmgpu: "*"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 180
     env:
       JULIA_AMDGPU_CORE_MUST_LOAD: "1"
       JULIA_AMDGPU_HIP_MUST_LOAD: "1"
+      JULIA_AMDGPU_DISABLE_ARTIFACTS: "1"
       NNLIB_TEST_AMDGPU: true
+      JULIA_NUM_THREADS: 4
 
 
   - label: "Benchmarks"
diff --git a/Project.toml b/Project.toml
index 0c8be3a00..bda17f137 100644
--- a/Project.toml
+++ b/Project.toml
@@ -25,7 +25,7 @@ NNlibCUDAExt = "CUDA"
 NNlibCUDACUDNNExt = ["CUDA", "cuDNN"]
 
 [compat]
-AMDGPU = "0.4.8"
+AMDGPU = "0.4.8, 0.5"
 Adapt = "3.2"
 Atomix = "0.1"
 ChainRulesCore = "1.13"
diff --git a/test/ext_amdgpu/dropout.jl b/test/ext_amdgpu/dropout.jl
index 80cd224fd..bd286c2f7 100644
--- a/test/ext_amdgpu/dropout.jl
+++ b/test/ext_amdgpu/dropout.jl
@@ -4,7 +4,7 @@
     @test size(@inferred dropout(x, 0.2; dims=2)) == (3, 4)
     @test size(@inferred dropout(x, 0.3; dims=(1, 2))) == (3, 4)
 
-    rng = AMDGPU.rocRAND.default_rng()
+    rng = AMDGPU.rocrand_rng()
     @test size(@inferred dropout(rng, x, 0.1)) == (3, 4)
     @test size(@inferred dropout(rng, x, 0.1; dims=2)) == (3, 4)
 
diff --git a/test/runtests.jl b/test/runtests.jl
index cc5f4f84f..9dc9c62f6 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -69,19 +69,13 @@ end
         if get(ENV, "NNLIB_TEST_AMDGPU", "false") == "true"
             import Pkg
             test_info = Pkg.project()
-            # Add MIOpen_jll to AMDGPU.
             Pkg.develop("AMDGPU")
-            Pkg.activate(joinpath(Pkg.devdir(), "AMDGPU"))
-            Pkg.add("MIOpen_jll")
-            Pkg.update()
-            # Update test project.
-            Pkg.activate(test_info.path)
-            Pkg.update()
 
             using AMDGPU
             if AMDGPU.functional()
                 @testset "ROCBackend" begin
                     nnlib_testsuite(ROCBackend)
+                    AMDGPU.synchronize(; blocking=false)
                 end
             else
                 @info "AMDGPU.jl is not functional. Skipping test suite for ROCBackend."
@@ -108,14 +102,7 @@ end
         if get(ENV, "NNLIB_TEST_AMDGPU", "false") == "true"
             import Pkg
             test_info = Pkg.project()
-            # Add MIOpen_jll to AMDGPU.
             Pkg.develop("AMDGPU")
-            Pkg.activate(joinpath(Pkg.devdir(), "AMDGPU"))
-            Pkg.add("MIOpen_jll")
-            Pkg.update()
-            # Update test project.
-            Pkg.activate(test_info.path)
-            Pkg.update()
 
             using AMDGPU
             AMDGPU.versioninfo()
@@ -123,6 +110,7 @@ end
                 @show AMDGPU.MIOpen.version()
                 @testset "AMDGPU" begin
                     include("ext_amdgpu/runtests.jl")
+                    AMDGPU.synchronize(; blocking=false)
                 end
             else
                 @info "AMDGPU.jl package is not functional. Skipping AMDGPU tests."