diff --git a/internal/home/clientshttp_internal_test.go b/internal/home/clientshttp_internal_test.go
index c5be1720..dc1aa87d 100644
--- a/internal/home/clientshttp_internal_test.go
+++ b/internal/home/clientshttp_internal_test.go
@@ -181,10 +181,10 @@ func TestClientsContainer_HandleAddClient(t *testing.T) {
 			body, err := json.Marshal(cj)
 			require.NoError(t, err)
 
-			rw := httptest.NewRecorder()
 			r, err := http.NewRequest(http.MethodPost, "", bytes.NewReader(body))
 			require.NoError(t, err)
 
+			rw := httptest.NewRecorder()
 			clients.handleAddClient(rw, r)
 			require.NoError(t, err)
 			require.Equal(t, tc.wantCode, rw.Code)
@@ -242,11 +242,11 @@ func TestClientsContainer_HandleDelClient(t *testing.T) {
 			body, err = json.Marshal(cj)
 			require.NoError(t, err)
 
-			rw := httptest.NewRecorder()
 			var r *http.Request
 			r, err = http.NewRequest(http.MethodPost, "", bytes.NewReader(body))
 			require.NoError(t, err)
 
+			rw := httptest.NewRecorder()
 			clients.handleDelClient(rw, r)
 			require.NoError(t, err)
 			require.Equal(t, tc.wantCode, rw.Code)
@@ -319,11 +319,11 @@ func TestClientsContainer_HandleUpdateClient(t *testing.T) {
 			body, err = json.Marshal(uj)
 			require.NoError(t, err)
 
-			rw := httptest.NewRecorder()
 			var r *http.Request
 			r, err = http.NewRequest(http.MethodPost, "", bytes.NewReader(body))
 			require.NoError(t, err)
 
+			rw := httptest.NewRecorder()
 			clients.handleUpdateClient(rw, r)
 			require.NoError(t, err)
 			require.Equal(t, tc.wantCode, rw.Code)
@@ -375,13 +375,12 @@ func TestClientsContainer_HandleFindClient(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			rw := httptest.NewRecorder()
 			var r *http.Request
 			r, err = http.NewRequest(http.MethodGet, "", nil)
 			require.NoError(t, err)
 
 			r.URL.RawQuery = tc.query.Encode()
-
+			rw := httptest.NewRecorder()
 			clients.handleFindClient(rw, r)
 			require.NoError(t, err)
 			require.Equal(t, tc.wantCode, rw.Code)