diff --git a/CHANGELOG b/CHANGELOG
index a2a129fde..7c4c983d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 Changes between 2.3.5 and 2.4.DEV
 -----------------------------------
 
+- fix issue300 - Fix order of conftest loading when starting py.test
+  in a subdirectory.
+
 - fix issue323 - sorting of many module-scoped arg parametrizations
 
 - add support for setUpModule/tearDownModule detection, thanks Brian Okken.