diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp
index d63cc04..34b2539 100644
--- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp
@@ -27,10 +27,8 @@
         const std::vector<int32_t>& outputData,
         int axis = 3)
 {
-    auto inputTensor = MakeTensor<T, 4>(inputTensorInfo, ConvertToDataType<ArmnnType>(inputData, inputTensorInfo));
-
-    LayerTestResult<int32_t, 3> result(outputTensorInfo);
-    result.outputExpected = MakeTensor<int32_t, 3>(outputTensorInfo, outputData);
+    std::vector<T> inputTensor = ConvertToDataType<ArmnnType>(inputData, inputTensorInfo);
+    std::vector<int32_t> actualOutput(outputTensorInfo.GetNumElements());
 
     std::unique_ptr<armnn::ITensorHandle> inputHandle  = tensorHandleFactory.CreateTensorHandle(inputTensorInfo);
     std::unique_ptr<armnn::ITensorHandle> outputHandle = tensorHandleFactory.CreateTensorHandle(outputTensorInfo);
@@ -48,14 +46,17 @@
     inputHandle->Allocate();
     outputHandle->Allocate();
 
-    CopyDataToITensorHandle(inputHandle.get(), &inputTensor[0][0][0][0]);
+    CopyDataToITensorHandle(inputHandle.get(), inputTensor.data());
 
     workload->PostAllocationConfigure();
     workload->Execute();
 
-    CopyDataFromITensorHandle(&result.output[0][0][0], outputHandle.get());
+    CopyDataFromITensorHandle(actualOutput.data(), outputHandle.get());
 
-    return result;
+    return LayerTestResult<int32_t, 3>(actualOutput,
+                                       outputData,
+                                       outputHandle->GetShape(),
+                                       outputTensorInfo.GetShape());
 }
 
 } // namespace
