diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp
index 815d1cae..5e271ad3 100644
--- a/test/camera/buffer_import.cpp
+++ b/test/camera/buffer_import.cpp
@@ -52,16 +52,9 @@ protected:
 		if (request->status() != Request::RequestComplete)
 			return;
 
-		const Request::BufferMap &buffers = request->buffers();
-
 		completeRequestsCount_++;
 
-		/* Create a new request. */
-		const Stream *stream = buffers.begin()->first;
-		FrameBuffer *buffer = buffers.begin()->second;
-
-		request->reuse();
-		request->addBuffer(stream, buffer);
+		request->reuse(Request::ReuseBuffers);
 		camera_->queueRequest(request);
 
 		dispatcher_->interrupt();
diff --git a/test/camera/camera_reconfigure.cpp b/test/camera/camera_reconfigure.cpp
index 06c87730..ae9941c1 100644
--- a/test/camera/camera_reconfigure.cpp
+++ b/test/camera/camera_reconfigure.cpp
@@ -46,14 +46,8 @@ private:
 		if (request->status() != Request::RequestComplete)
 			return;
 
-		const Request::BufferMap &buffers = request->buffers();
-
-		const Stream *stream = buffers.begin()->first;
-		FrameBuffer *buffer = buffers.begin()->second;
-
 		/* Reuse the request and re-queue it with the same buffers. */
-		request->reuse();
-		request->addBuffer(stream, buffer);
+		request->reuse(Request::ReuseBuffers);
 		camera_->queueRequest(request);
 	}
 
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index 8766fb19..fabe297e 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -48,16 +48,9 @@ protected:
 		if (request->status() != Request::RequestComplete)
 			return;
 
-		const Request::BufferMap &buffers = request->buffers();
-
 		completeRequestsCount_++;
 
-		/* Create a new request. */
-		const Stream *stream = buffers.begin()->first;
-		FrameBuffer *buffer = buffers.begin()->second;
-
-		request->reuse();
-		request->addBuffer(stream, buffer);
+		request->reuse(Request::ReuseBuffers);
 		camera_->queueRequest(request);
 
 		dispatcher_->interrupt();