diff --git a/pkg/client/fake.go b/pkg/client/fake.go
index 64975530def..0ed9b4e0838 100644
--- a/pkg/client/fake.go
+++ b/pkg/client/fake.go
@@ -80,9 +80,9 @@ func (c *Fake) ServerAPIVersions() (*api.APIVersions, error) {
 	return &api.APIVersions{Versions: []string{"v1beta1", "v1beta2"}}, nil
 }
 
-type HttpClientFunc func(*http.Request) (*http.Response, error)
+type HTTPClientFunc func(*http.Request) (*http.Response, error)
 
-func (f HttpClientFunc) Do(req *http.Request) (*http.Response, error) {
+func (f HTTPClientFunc) Do(req *http.Request) (*http.Response, error) {
 	return f(req)
 }
 
diff --git a/pkg/client/request.go b/pkg/client/request.go
index 44e202d3544..f7bdf68fcf3 100644
--- a/pkg/client/request.go
+++ b/pkg/client/request.go
@@ -226,6 +226,9 @@ func (r *Request) SelectorParam(paramName string, s labels.Selector) *Request {
 	if r.err != nil {
 		return r
 	}
+	if s.Empty() {
+		return r
+	}
 	return r.setParam(paramName, s.String())
 }
 
diff --git a/pkg/kubectl/resthelper_test.go b/pkg/kubectl/resthelper_test.go
index 5aa25ab25b9..94db10f48f3 100644
--- a/pkg/kubectl/resthelper_test.go
+++ b/pkg/kubectl/resthelper_test.go
@@ -125,7 +125,7 @@ func TestRESTHelperCreate(t *testing.T) {
 
 	tests := []struct {
 		Resp     *http.Response
-		RespFunc client.HttpClientFunc
+		RespFunc client.HTTPClientFunc
 		HttpErr  error
 		Modify   bool
 		Object   runtime.Object
@@ -299,7 +299,7 @@ func TestRESTHelperUpdate(t *testing.T) {
 
 	tests := []struct {
 		Resp      *http.Response
-		RespFunc  client.HttpClientFunc
+		RespFunc  client.HTTPClientFunc
 		HttpErr   error
 		Overwrite bool
 		Object    runtime.Object
diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/plugin/pkg/scheduler/factory/factory_test.go
index 3075775716a..6fe76fa8601 100644
--- a/plugin/pkg/scheduler/factory/factory_test.go
+++ b/plugin/pkg/scheduler/factory/factory_test.go
@@ -55,7 +55,7 @@ func TestCreateLists(t *testing.T) {
 	}{
 		// Minion
 		{
-			location: "/api/" + testapi.Version() + "/minions?fields=",
+			location: "/api/" + testapi.Version() + "/minions",
 			factory:  factory.createMinionLW,
 		},
 		// Assigned pod
@@ -95,15 +95,15 @@ func TestCreateWatches(t *testing.T) {
 		// Minion watch
 		{
 			rv:       "",
-			location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=",
+			location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=",
 			factory:  factory.createMinionLW,
 		}, {
 			rv:       "0",
-			location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=0",
+			location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=0",
 			factory:  factory.createMinionLW,
 		}, {
 			rv:       "42",
-			location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=42",
+			location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=42",
 			factory:  factory.createMinionLW,
 		},
 		// Assigned pod watches