diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd59af1..0d1fd56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release..
 
+## TBD - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Updated `composer.json` to push `PhlyTest\\Conduit\\` namespace autoloading to the `autoload-dev` section (meaning no entry will be added when generating production autoloader rules).
+
 ## 0.6.1 - 2014-10-13
 
 ### Added
diff --git a/composer.json b/composer.json
index 870ba02..70a323a 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,11 @@
   },
   "autoload": {
     "psr-4": {
-      "Phly\\Conduit\\": "src/",
+      "Phly\\Conduit\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
       "PhlyTest\\Conduit\\": "test/"
     }
   }