diff --git a/cluster/node_test.go b/cluster/node_test.go
index 0f1578d05f..8d04a1a12c 100644
--- a/cluster/node_test.go
+++ b/cluster/node_test.go
@@ -22,7 +22,7 @@ var (
 )
 
 func TestNodeConnectionFailure(t *testing.T) {
-	node := NewNode("test", "test")
+	node := NewNode("test")
 	assert.False(t, node.IsConnected())
 
 	// Always fail.
@@ -37,7 +37,7 @@ func TestNodeConnectionFailure(t *testing.T) {
 }
 
 func TestNodeSpecs(t *testing.T) {
-	node := NewNode("test", "test")
+	node := NewNode("test")
 	assert.False(t, node.IsConnected())
 
 	client := dockerclient.NewMockClient()
@@ -59,7 +59,7 @@ func TestNodeSpecs(t *testing.T) {
 }
 
 func TestNodeState(t *testing.T) {
-	node := NewNode("test", "test")
+	node := NewNode("test")
 	assert.False(t, node.IsConnected())
 
 	client := dockerclient.NewMockClient()
diff --git a/scheduler/filter/attribute_test.go b/scheduler/filter/attribute_test.go
index ce99cc958b..acebe3ab04 100644
--- a/scheduler/filter/attribute_test.go
+++ b/scheduler/filter/attribute_test.go
@@ -12,9 +12,9 @@ func TestAttributeFilter(t *testing.T) {
 	var (
 		f     = AttributeFilter{}
 		nodes = []*cluster.Node{
-			cluster.NewNode("node-1", ""),
-			cluster.NewNode("node-2", ""),
-			cluster.NewNode("node-3", ""),
+			cluster.NewNode("node-1"),
+			cluster.NewNode("node-2"),
+			cluster.NewNode("node-3"),
 		}
 		result []*cluster.Node
 		err    error
diff --git a/scheduler/filter/port_test.go b/scheduler/filter/port_test.go
index 65a969ccb2..cbcb3bb810 100644
--- a/scheduler/filter/port_test.go
+++ b/scheduler/filter/port_test.go
@@ -24,9 +24,9 @@ func TestPortFilterNoConflicts(t *testing.T) {
 	var (
 		p     = PortFilter{}
 		nodes = []*cluster.Node{
-			cluster.NewNode("node-1", ""),
-			cluster.NewNode("node-2", ""),
-			cluster.NewNode("node-3", ""),
+			cluster.NewNode("node-1"),
+			cluster.NewNode("node-2"),
+			cluster.NewNode("node-3"),
 		}
 		result []*cluster.Node
 		err    error
@@ -71,9 +71,9 @@ func TestPortFilterSimple(t *testing.T) {
 	var (
 		p     = PortFilter{}
 		nodes = []*cluster.Node{
-			cluster.NewNode("node-1", ""),
-			cluster.NewNode("node-2", ""),
-			cluster.NewNode("node-3", ""),
+			cluster.NewNode("node-1"),
+			cluster.NewNode("node-2"),
+			cluster.NewNode("node-3"),
 		}
 		result []*cluster.Node
 		err    error
@@ -101,9 +101,9 @@ func TestPortFilterDifferentInterfaces(t *testing.T) {
 	var (
 		p     = PortFilter{}
 		nodes = []*cluster.Node{
-			cluster.NewNode("node-1", ""),
-			cluster.NewNode("node-2", ""),
-			cluster.NewNode("node-3", ""),
+			cluster.NewNode("node-1"),
+			cluster.NewNode("node-2"),
+			cluster.NewNode("node-3"),
 		}
 		result []*cluster.Node
 		err    error
diff --git a/scheduler/strategy/binpacking_test.go b/scheduler/strategy/binpacking_test.go
index b6e430cd9d..9f60881573 100644
--- a/scheduler/strategy/binpacking_test.go
+++ b/scheduler/strategy/binpacking_test.go
@@ -10,7 +10,8 @@ import (
 )
 
 func createNode(ID string, memory int64, cpus int64) *cluster.Node {
-	node := cluster.NewNode(ID, "")
+	node := cluster.NewNode(ID)
+	node.ID = ID
 	node.Memory = memory * 1024 * 1024 * 1024
 	node.Cpus = cpus
 	return node