diff --git a/dynamic/dynamicinformer/informer_test.go b/dynamic/dynamicinformer/informer_test.go
index 02a3c999a..6c779f890 100644
--- a/dynamic/dynamicinformer/informer_test.go
+++ b/dynamic/dynamicinformer/informer_test.go
@@ -18,6 +18,7 @@ package dynamicinformer_test
 
 import (
 	"context"
+	"fmt"
 	"testing"
 	"time"
 
@@ -68,6 +69,12 @@ func TestWatchListSemanticsSimple(t *testing.T) {
 	clientfeaturestesting.SetFeatureDuringTest(t, clientfeatures.WatchListClient, true)
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		if _, ok := req.URL.Query()["watch"]; !ok {
+			t.Errorf("expected a watch request, params: %v", req.URL.Query())
+			http.Error(w, fmt.Errorf("unexpected request").Error(), http.StatusInternalServerError)
+			return
+		}
+
 		obj := &appsv1.Deployment{
 			TypeMeta: metav1.TypeMeta{
 				APIVersion: "apps/v1",
diff --git a/metadata/metadatainformer/informer_test.go b/metadata/metadatainformer/informer_test.go
index a1b9a99a6..baef474fb 100644
--- a/metadata/metadatainformer/informer_test.go
+++ b/metadata/metadatainformer/informer_test.go
@@ -19,6 +19,7 @@ package metadatainformer
 import (
 	"context"
 	"flag"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -52,6 +53,12 @@ func TestWatchListSemanticsSimple(t *testing.T) {
 	clientfeaturestesting.SetFeatureDuringTest(t, clientfeatures.WatchListClient, true)
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		if _, ok := req.URL.Query()["watch"]; !ok {
+			t.Errorf("expected a watch request, params: %v", req.URL.Query())
+			http.Error(w, fmt.Errorf("unexpected request").Error(), http.StatusInternalServerError)
+			return
+		}
+
 		obj := &metav1.PartialObjectMetadata{
 			TypeMeta: metav1.TypeMeta{
 				APIVersion: "meta.k8s.io/v1",