diff --git a/src/mockchunks.jl b/src/mockchunks.jl
index 0e3893d..6d6d74a 100644
--- a/src/mockchunks.jl
+++ b/src/mockchunks.jl
@@ -33,7 +33,7 @@ function mockchunks(data::AbstractArray, chunks)
     else
         GridChunks(data, chunks)
     end
-    MockChunkedDiskArray(data, GridChunks(data, chunks))
+    MockChunkedDiskArray(data, gridchunks)
 end
 
 
diff --git a/test/runtests.jl b/test/runtests.jl
index f6a439c..645f033 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1132,3 +1132,15 @@ end
     @inferred DiskArrays.DiskIndex(a_view5, (1:1, 1:1, 1:1, 1:1, 1:1), DiskArrays.NoBatch()) #DiskArrays.DiskIndex
     @inferred DiskArrays.DiskIndex(a_view6, (1:1, 1:1, 1:1, 1:1, 1:1, 1:1), DiskArrays.NoBatch()) #DiskArrays.DiskIndex
 end
+
+@testset "mockchunks" begin
+    a =UnchunkedDiskArray(rand(10,10))
+    chunks = DiskArrays.RegularChunks.((5,5), (0,0), (10,10))
+    gchunks = DiskArrays.GridChunks(chunks)
+    a_chunked = DiskArrays.mockchunks(a, gchunks)
+    @test a_chunked isa DiskArrays.MockChunkedDiskArray
+    @test size(DiskArrays.eachchunk(a_chunked)) == (2,2)
+    a_chunked_2 = DiskArrays.mockchunks(a, (2,2))
+    @test DiskArrays.haschunks(a_chunked_2) isa DiskArrays.Chunked
+    @test size(DiskArrays.eachchunk(a_chunked_2)) == (5,5)
+end