diff --git a/pkg/frontend/querymiddleware/remote_read_test.go b/pkg/frontend/querymiddleware/remote_read_test.go
index fae8f1d84e6..05de9f8e363 100644
--- a/pkg/frontend/querymiddleware/remote_read_test.go
+++ b/pkg/frontend/querymiddleware/remote_read_test.go
@@ -40,7 +40,7 @@ func TestParseRemoteReadRequestWithoutConsumingBody(t *testing.T) {
 		},
 		"valid body": {
 			makeRequest: func() *http.Request {
-				return generateTestRemoteReadHTTPRequest(generateTestRemoteReadRequest())
+				return makeTestHTTPRequestFromRemoteRead(makeTestRemoteReadRequest())
 			},
 			expectedParams: url.Values{
 				"start_0":    []string{"0"},
@@ -136,7 +136,7 @@ func TestRemoteReadRoundTripperCallsDownstreamOnAll(t *testing.T) {
 				return tc.handler
 			})
 			rr := newRemoteReadRoundTripper(roundTripper, middleware)
-			_, err := rr.RoundTrip(generateTestRemoteReadHTTPRequest(generateTestRemoteReadRequest()))
+			_, err := rr.RoundTrip(makeTestHTTPRequestFromRemoteRead(makeTestRemoteReadRequest()))
 			if tc.expectError != "" {
 				require.Error(t, err)
 				require.Equal(t, tc.expectError, err.Error())
@@ -172,7 +172,7 @@ func TestRemoteReadRoundTripper_ShouldAllowMiddlewaresToManipulateRequest(t *tes
 		expectedEndMs   = 2
 	)
 
-	origRemoteReadReq := generateTestRemoteReadRequest()
+	origRemoteReadReq := makeTestRemoteReadRequest()
 
 	// Create a middleware that manipulate the query start/end timestamps.
 	middleware := MetricsQueryMiddlewareFunc(func(next MetricsQueryHandler) MetricsQueryHandler {
@@ -191,7 +191,7 @@ func TestRemoteReadRoundTripper_ShouldAllowMiddlewaresToManipulateRequest(t *tes
 	}
 
 	rr := newRemoteReadRoundTripper(downstream, middleware)
-	_, err := rr.RoundTrip(generateTestRemoteReadHTTPRequest(origRemoteReadReq))
+	_, err := rr.RoundTrip(makeTestHTTPRequestFromRemoteRead(origRemoteReadReq))
 	require.NoError(t, err)
 	require.NotNil(t, downstreamReq)
 
@@ -206,13 +206,13 @@ func TestRemoteReadRoundTripper_ShouldAllowMiddlewaresToManipulateRequest(t *tes
 
 	// Ensure the downstream received the manipulated start/end timestamps.
 	for i, query := range downstreamRemoteReadReq.Queries {
-		require.Equal(t, int64(1), query.StartTimestampMs)
-		require.Equal(t, int64(2), query.EndTimestampMs)
+		require.Equal(t, int64(expectedStartMs), query.StartTimestampMs)
+		require.Equal(t, int64(expectedEndMs), query.EndTimestampMs)
 
 		if origRemoteReadReq.Queries[i].Hints != nil {
 			require.NotNil(t, query.Hints)
-			require.Equal(t, int64(1), query.Hints.StartMs)
-			require.Equal(t, int64(2), query.Hints.EndMs)
+			require.Equal(t, int64(expectedStartMs), query.Hints.StartMs)
+			require.Equal(t, int64(expectedEndMs), query.Hints.EndMs)
 		}
 	}
 
@@ -324,7 +324,7 @@ func TestRemoteReadQueryRequest_WithStartEnd(t *testing.T) {
 	}
 }
 
-func generateTestRemoteReadHTTPRequest(readReq *prompb.ReadRequest) *http.Request {
+func makeTestHTTPRequestFromRemoteRead(readReq *prompb.ReadRequest) *http.Request {
 	request := httptest.NewRequest("GET", "/api/v1/read", nil)
 	request.Header.Add("User-Agent", "test-user-agent")
 	request.Header.Add("Content-Type", "application/x-protobuf")
@@ -336,7 +336,7 @@ func generateTestRemoteReadHTTPRequest(readReq *prompb.ReadRequest) *http.Reques
 	return request
 }
 
-func generateTestRemoteReadRequest() *prompb.ReadRequest {
+func makeTestRemoteReadRequest() *prompb.ReadRequest {
 	return &prompb.ReadRequest{
 		Queries: []*prompb.Query{
 			{
@@ -346,6 +346,7 @@ func generateTestRemoteReadRequest() *prompb.ReadRequest {
 				},
 				StartTimestampMs: 0,
 				EndTimestampMs:   42,
+				Hints:            nil, // Don't add hints to this query so that we exercise code when the request query has no hints.
 			},
 			{
 				Matchers: []*prompb.LabelMatcher{
diff --git a/pkg/frontend/querymiddleware/roundtrip_test.go b/pkg/frontend/querymiddleware/roundtrip_test.go
index 62aaf6ec28a..683eae4789c 100644
--- a/pkg/frontend/querymiddleware/roundtrip_test.go
+++ b/pkg/frontend/querymiddleware/roundtrip_test.go
@@ -610,7 +610,7 @@ func TestRemoteReadMiddleware(t *testing.T) {
 	}{
 		"valid query": {
 			makeRequest: func() *http.Request {
-				return generateTestRemoteReadHTTPRequest(generateTestRemoteReadRequest())
+				return makeTestHTTPRequestFromRemoteRead(makeTestRemoteReadRequest())
 			},
 			limits: mockLimits{},
 		},