diff --git a/platforms/gpio/analog_sensor_driver.go b/platforms/gpio/analog_sensor_driver.go
index 0d528f05..d1fd5c62 100644
--- a/platforms/gpio/analog_sensor_driver.go
+++ b/platforms/gpio/analog_sensor_driver.go
@@ -9,9 +9,11 @@ type AnalogSensorDriver struct {
 	Adaptor AnalogReader
 }
 
-func NewAnalogSensor(a AnalogReader) *AnalogSensorDriver {
+func NewAnalogSensor(a AnalogReader, name string, pin string) *AnalogSensorDriver {
 	return &AnalogSensorDriver{
 		Driver: gobot.Driver{
+			Name: name,
+			Pin:  pin,
 			Commands: []string{
 				"ReadC",
 			},
diff --git a/platforms/gpio/analog_sensor_driver_test.go b/platforms/gpio/analog_sensor_driver_test.go
index 6e996a0b..0e7ce395 100644
--- a/platforms/gpio/analog_sensor_driver_test.go
+++ b/platforms/gpio/analog_sensor_driver_test.go
@@ -12,8 +12,7 @@ var _ = Describe("Analog-Sensor", func() {
 	)
 
 	BeforeEach(func() {
-		a = NewAnalogSensor(t)
-		a.Pin = "1"
+		a = NewAnalogSensor(t, "bot", "1")
 	})
 
 	It("Must be able to Read", func() {
diff --git a/platforms/gpio/button_driver.go b/platforms/gpio/button_driver.go
index 68ae1135..3e18107d 100644
--- a/platforms/gpio/button_driver.go
+++ b/platforms/gpio/button_driver.go
@@ -10,9 +10,11 @@ type ButtonDriver struct {
 	Active  bool
 }
 
-func NewButtonDriver(a DigitalReader) *ButtonDriver {
+func NewButtonDriver(a DigitalReader, name string, pin string) *ButtonDriver {
 	return &ButtonDriver{
 		Driver: gobot.Driver{
+			Name: name,
+			Pin:  pin,
 			Events: map[string]chan interface{}{
 				"push":    make(chan interface{}),
 				"release": make(chan interface{}),
diff --git a/platforms/gpio/button_driver_test.go b/platforms/gpio/button_driver_test.go
index d8105cb0..247983a2 100644
--- a/platforms/gpio/button_driver_test.go
+++ b/platforms/gpio/button_driver_test.go
@@ -12,8 +12,7 @@ var _ = Describe("Button", func() {
 	)
 
 	BeforeEach(func() {
-		b = NewButtonDriver(t)
-		b.Pin = "1"
+		b = NewButtonDriver(t, "bot", "1")
 	})
 
 	It("Must be able to readState", func() {
diff --git a/platforms/gpio/direct_pin_driver.go b/platforms/gpio/direct_pin_driver.go
index cba7d385..64083a39 100644
--- a/platforms/gpio/direct_pin_driver.go
+++ b/platforms/gpio/direct_pin_driver.go
@@ -9,9 +9,11 @@ type DirectPinDriver struct {
 	Adaptor DirectPin
 }
 
-func NewDirectPinDriver(a DirectPin) *DirectPinDriver {
+func NewDirectPinDriver(a DirectPin, name string, pin string) *DirectPinDriver {
 	return &DirectPinDriver{
 		Driver: gobot.Driver{
+			Name: name,
+			Pin:  pin,
 			Commands: []string{
 				"DigitalReadC",
 				"DigitalWriteC",
diff --git a/platforms/gpio/direct_pin_driver_test.go b/platforms/gpio/direct_pin_driver_test.go
index fa269f17..b63b8798 100644
--- a/platforms/gpio/direct_pin_driver_test.go
+++ b/platforms/gpio/direct_pin_driver_test.go
@@ -12,8 +12,7 @@ var _ = Describe("DirectPin", func() {
 	)
 
 	BeforeEach(func() {
-		d = NewDirectPinDriver(t)
-		d.Pin = "1"
+		d = NewDirectPinDriver(t, "bot", "1")
 	})
 
 	It("Should be able to DigitalRead", func() {
diff --git a/platforms/gpio/led_driver.go b/platforms/gpio/led_driver.go
index 2923de10..638dd68c 100644
--- a/platforms/gpio/led_driver.go
+++ b/platforms/gpio/led_driver.go
@@ -10,7 +10,7 @@ type LedDriver struct {
 	High    bool
 }
 
-func NewLedDriver(a PwmDigitalWriter, name, pin string) *LedDriver {
+func NewLedDriver(a PwmDigitalWriter, name string, pin string) *LedDriver {
 	return &LedDriver{
 		Driver: gobot.Driver{
 			Name: name,
diff --git a/platforms/gpio/motor_driver.go b/platforms/gpio/motor_driver.go
index a3b80e5e..91cfdd91 100644
--- a/platforms/gpio/motor_driver.go
+++ b/platforms/gpio/motor_driver.go
@@ -18,9 +18,11 @@ type MotorDriver struct {
 	CurrentDirection string
 }
 
-func NewMotorDriver(a PwmDigitalWriter) *MotorDriver {
+func NewMotorDriver(a PwmDigitalWriter, name string, pin string) *MotorDriver {
 	return &MotorDriver{
 		Driver: gobot.Driver{
+			Name: name,
+			Pin:  pin,
 			Commands: []string{
 				"OffC",
 				"OnC",
diff --git a/platforms/gpio/motor_driver_test.go b/platforms/gpio/motor_driver_test.go
index 9267fd19..8d6d303a 100644
--- a/platforms/gpio/motor_driver_test.go
+++ b/platforms/gpio/motor_driver_test.go
@@ -12,8 +12,7 @@ var _ = Describe("Motor", func() {
 	)
 
 	BeforeEach(func() {
-		m = NewMotorDriver(t)
-		m.Pin = "1"
+		m = NewMotorDriver(t, "bot", "1")
 	})
 
 	It("Must be able to Start", func() {
diff --git a/platforms/gpio/servo_driver.go b/platforms/gpio/servo_driver.go
index 13554c80..f812faaa 100644
--- a/platforms/gpio/servo_driver.go
+++ b/platforms/gpio/servo_driver.go
@@ -10,9 +10,11 @@ type ServoDriver struct {
 	CurrentAngle byte
 }
 
-func NewServoDriver(a Servo) *ServoDriver {
+func NewServoDriver(a Servo, name string, pin string) *ServoDriver {
 	return &ServoDriver{
 		Driver: gobot.Driver{
+			Name: name,
+			Pin:  pin,
 			Commands: []string{
 				"MoveC",
 				"MinC",
diff --git a/platforms/gpio/servo_driver_test.go b/platforms/gpio/servo_driver_test.go
index dd84091c..9818a1ac 100644
--- a/platforms/gpio/servo_driver_test.go
+++ b/platforms/gpio/servo_driver_test.go
@@ -12,8 +12,7 @@ var _ = Describe("Servo", func() {
 	)
 
 	BeforeEach(func() {
-		s = NewServoDriver(t)
-		s.Pin = "1"
+		s = NewServoDriver(t, "bot", "1")
 	})
 
 	It("Should be able to Move", func() {