@@ -492,7 +492,7 @@ osc delete bc/ruby-sample-build-invalidtag

 # Test admin manage-node operations

 [ "$(openshift admin manage-node --help 2>&1 | grep 'Manage node operations')" ]

-[ "$(osadm manage-node --schedulable=true | grep --text 'Ready' | grep -v 'Sched')" ]

+[ "$(osadm manage-node --selector='' --schedulable=true | grep --text 'Ready' | grep -v 'Sched')" ]

 osc create -f examples/hello-openshift/hello-pod.json

 #[ "$(osadm manage-node --list-pods | grep 'hello-openshift' | grep -E '(unassigned|assigned)')" ]

 #[ "$(osadm manage-node --evacuate --dry-run | grep 'hello-openshift')" ]

@@ -64,7 +64,8 @@ func NewCommandManageNode(f *clientcmd.Factory, commandName, fullName string, ou

 				kcmdutil.CheckErr(err)

 			}

-			if err := opts.Validate(); err != nil {

+			checkNodeSelector := c.Flag("selector").Changed

+			if err := opts.Validate(checkNodeSelector); err != nil {

 				kcmdutil.CheckErr(kcmdutil.UsageError(c, err.Error()))

 			}

@@ -78,15 +78,19 @@ func (n *NodeOptions) Complete(f *clientcmd.Factory, c *cobra.Command, args []st

 	return nil

 }

-func (n *NodeOptions) Validate() error {

+func (n *NodeOptions) Validate(checkNodeSelector bool) error {

 	errList := []error{}

-	if len(n.Selector) > 0 {

-		if _, err := labels.Parse(n.Selector); err != nil {

-			errList = append(errList, errors.New("--selector=<node_selector> must be a valid label selector"))

+	if checkNodeSelector {

+		if len(n.Selector) > 0 {

+			if _, err := labels.Parse(n.Selector); err != nil {

+				errList = append(errList, errors.New("--selector=<node_selector> must be a valid label selector"))

+			}

 		}

 		if len(n.NodeNames) != 0 {

 			errList = append(errList, errors.New("either specify --selector=<node_selector> or nodes but not both"))

 		}

+	} else if len(n.NodeNames) == 0 {

+		errList = append(errList, errors.New("must provide --selector=<node_selector> or nodes"))

 	}

 	if len(n.PodSelector) > 0 {