diff --git a/lib/migrate.js b/lib/migrate.js
index 42150904e1..c610dbb169 100644
--- a/lib/migrate.js
+++ b/lib/migrate.js
@@ -129,7 +129,10 @@ Migrate.prototype = {
         return Promise.promisify(fs.readdir, fs)(this.config.directory);
       })
       .then(function(migrations) {
-        return migrations.sort();
+        var ext = this.config.extension;
+        return _.filter(migrations, function (value) {
+          return value.indexOf(ext, value.length - ext.length) !== -1;
+        }).sort();
       });
   },
 
diff --git a/test/integration/migrate/test/random_bad_file.txt b/test/integration/migrate/test/random_bad_file.txt
new file mode 100644
index 0000000000..158dec102b
--- /dev/null
+++ b/test/integration/migrate/test/random_bad_file.txt
@@ -0,0 +1 @@
+This is definitely not a migration.