diff --git a/lib/adaptor.js b/lib/adaptor.js
index 8b50745..dc16e11 100644
--- a/lib/adaptor.js
+++ b/lib/adaptor.js
@@ -32,11 +32,12 @@ module.exports = Adaptor = function Adaptor(opts) {
   this.self = this;
   this.name = opts.name;
   this.connection = opts.connection;
-  this.commands = [];
 };
 
 Utils.subclass(Adaptor, Basestar);
 
+Adaptor.prototype.commands = [];
+
 // Public: Connects to the adaptor, and triggers the provided callback when
 // done.
 //
diff --git a/lib/driver.js b/lib/driver.js
index 98b3517..0953311 100644
--- a/lib/driver.js
+++ b/lib/driver.js
@@ -33,11 +33,12 @@ module.exports = Driver = function Driver(opts) {
   this.name = opts.name;
   this.device = opts.device;
   this.connection = this.device.connection;
-  this.commands = [];
 };
 
 Utils.subclass(Driver, Basestar);
 
+Driver.prototype.commands = [];
+
 // Public: Starts up the driver, and triggers the provided callback when done.
 //
 // callback - function to run when the driver is started