diff --git a/test/resolve_exposed.js b/test/resolve_exposed.js
index 0d3efc24b..1dbea4211 100644
--- a/test/resolve_exposed.js
+++ b/test/resolve_exposed.js
@@ -4,7 +4,7 @@ var test = require('tap').test;
 
 test('resolve exposed files', function (t) {
     t.plan(2);
-    
+
     var b = browserify(__dirname + '/resolve_exposed/main.js', {
         basedir: __dirname + '/resolve_exposed'
     });
@@ -18,3 +18,71 @@ test('resolve exposed files', function (t) {
         }
     });
 });
+
+test('resolve exposed files without extension', function (t) {
+  t.plan(2);
+
+  var b = browserify(__dirname + '/resolve_exposed/main.js', {
+    basedir: __dirname + '/resolve_exposed'
+  });
+  b.require('./x', {expose: 'xyz'});
+  b.bundle(function (err, src) {
+    t.ifError(err);
+    var c = {console: {log: log}};
+    vm.runInNewContext(src, c);
+    function log(x) {
+      t.equal(x, 333);
+    }
+  });
+});
+
+test('resolve exposed directories', function (t) {
+  t.plan(2);
+
+  var b = browserify(__dirname + '/resolve_exposed/main.js', {
+    basedir: __dirname + '/resolve_exposed'
+  });
+  b.require('./y', {expose: 'xyz'});
+  b.bundle(function (err, src) {
+    t.ifError(err);
+    var c = {console: {log: log}};
+    vm.runInNewContext(src, c);
+    function log(x) {
+      t.equal(x, 555);
+    }
+  });
+});
+
+test('resolve exposed index from directories', function (t) {
+  t.plan(2);
+
+  var b = browserify(__dirname + '/resolve_exposed/main.js', {
+    basedir: __dirname + '/resolve_exposed'
+  });
+  b.require('./y/index', {expose: 'xyz'});
+  b.bundle(function (err, src) {
+    t.ifError(err);
+    var c = {console: {log: log}};
+    vm.runInNewContext(src, c);
+    function log(x) {
+      t.equal(x, 555);
+    }
+  });
+});
+
+test('resolve exposed index.js from directories', function (t) {
+  t.plan(2);
+
+  var b = browserify(__dirname + '/resolve_exposed/main.js', {
+    basedir: __dirname + '/resolve_exposed'
+  });
+  b.require('./y/index.js', {expose: 'xyz'});
+  b.bundle(function (err, src) {
+    t.ifError(err);
+    var c = {console: {log: log}};
+    vm.runInNewContext(src, c);
+    function log(x) {
+      t.equal(x, 555);
+    }
+  });
+});
diff --git a/test/resolve_exposed/y/index.js b/test/resolve_exposed/y/index.js
new file mode 100644
index 000000000..caedade49
--- /dev/null
+++ b/test/resolve_exposed/y/index.js
@@ -0,0 +1 @@
+module.exports = 5