diff --git a/lib/module.js b/lib/module.js
index 6dab4919df..8662b4ee90 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -172,19 +172,20 @@ Module._findPath = function(request, paths) {
     var filename;
 
     if (!trailingSlash) {
+      var stats = statPath(basePath);
       // try to join the request to the path
       filename = tryFile(basePath);
 
-      if (!filename && !trailingSlash) {
+      if (!filename && stats && stats.isDirectory()) {
+        filename = tryPackage(basePath, exts);
+      }
+
+      if (!filename) {
         // try it with each of the extensions
         filename = tryExtensions(basePath, exts);
       }
     }
 
-    if (!filename) {
-      filename = tryPackage(basePath, exts);
-    }
-
     if (!filename) {
       // try it with each of the extensions at "index"
       filename = tryExtensions(path.resolve(basePath, 'index'), exts);
diff --git a/test/fixtures/json-with-directory-name-module/module-stub.json b/test/fixtures/json-with-directory-name-module/module-stub.json
new file mode 100644
index 0000000000..472a445adb
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub.json
@@ -0,0 +1 @@
+{"rocko": "artischocko"}
diff --git a/test/fixtures/json-with-directory-name-module/module-stub/index.js b/test/fixtures/json-with-directory-name-module/module-stub/index.js
new file mode 100644
index 0000000000..5cbb00b63c
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub/index.js
@@ -0,0 +1,22 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module.exports = "hello from module-stub!"
diff --git a/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js b/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js
new file mode 100644
index 0000000000..a02399ef8b
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js
@@ -0,0 +1,22 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module.exports = require('../../');
diff --git a/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js b/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js
new file mode 100644
index 0000000000..19025cdc74
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js
@@ -0,0 +1,22 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module.exports = require('../..');
diff --git a/test/fixtures/json-with-directory-name-module/module-stub/package.json b/test/fixtures/json-with-directory-name-module/module-stub/package.json
new file mode 100644
index 0000000000..4c380f620b
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub/package.json
@@ -0,0 +1,7 @@
+{
+  "version": "1.1.12",
+  "name": "module-stub",
+  "main": "./index.js",
+  "description": "A stub for node tests",
+  "author": "Robert Kowalski <rok@kowalski.gd>"
+}
diff --git a/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js b/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js
new file mode 100644
index 0000000000..6469d14ffd
--- /dev/null
+++ b/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js
@@ -0,0 +1,29 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+var content = require(common.fixturesDir +
+  '/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js');
+
+assert.notEqual(content.rocko, 'artischocko');
+assert.equal(content, 'hello from module-stub!');
diff --git a/test/simple/test-require-extensions-same-filename-as-dir.js b/test/simple/test-require-extensions-same-filename-as-dir.js
new file mode 100644
index 0000000000..fbfba3b9bc
--- /dev/null
+++ b/test/simple/test-require-extensions-same-filename-as-dir.js
@@ -0,0 +1,29 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+var content = require(common.fixturesDir +
+  '/json-with-directory-name-module/module-stub/one/two/three.js');
+
+assert.notEqual(content.rocko, 'artischocko');
+assert.equal(content, 'hello from module-stub!');