diff --git a/lib/asset-rev.js b/lib/asset-rev.js
index 24135e2..0b92095 100644
--- a/lib/asset-rev.js
+++ b/lib/asset-rev.js
@@ -18,8 +18,6 @@ function AssetRev(inputTree, options) {
   this.replaceExtensions = options.replaceExtensions || defaults.replaceExtensions;
   this.exclude = exclude;
   this.fingerprintAssetMap = options.fingerprintAssetMap || defaults.fingerprintAssetMap;
-  this.generateAssetMap = options.generateAssetMap;
-  this.generateRailsManifest = options.generateRailsManifest;
   this.assetMapPath = options.assetMapPath || defaults.assetMapPath;
   this.railsManifestPath = options.railsManifestPath || defaults.railsManifestPath;
   this.prepend = options.prepend || defaults.prepend;
@@ -29,12 +27,16 @@ function AssetRev(inputTree, options) {
   // first pass - excludes replaceable source code
   this.exclude = exclude.slice();
   this.replaceExtensions.forEach(function(ext) { this.exclude.push('**/*.' + ext); }, this);
+  this.generateAssetMap = false;
+  this.generateRailsManifest = false;
   var fingerprintTree = Fingerprint(inputTree, this);
   var assetRewrite = UseRev(fingerprintTree, this);
 
   // second pass - fingerprints replaceable source code
   this.exclude = exclude;
   this.onlyHash = this.replaceExtensions;
+  this.generateAssetMap = options.generateAssetMap;
+  this.generateRailsManifest = options.generateRailsManifest;
   var fingerprintTree2 = Fingerprint(assetRewrite, this);
   var assetRewrite2 = UseRev(fingerprintTree2, this);
 
diff --git a/tests/filter-tests.js b/tests/filter-tests.js
index 4fa5571..bf803b0 100644
--- a/tests/filter-tests.js
+++ b/tests/filter-tests.js
@@ -213,7 +213,7 @@ describe('broccoli-asset-rev', function() {
       );
 
       var mappedFiles = actualFiles.filter(function(name) {
-        if (-1 !== name.lastIndexOf('assetMap.json')) return true;
+        if (-1 !== name.lastIndexOf('assetMap.json')) return false;
         for (var i = 0; i < extensions.length; ++i) {
           if (-1 !== name.lastIndexOf(extensions[i])) {
             return fs.statSync(path.join(graph.directory, name)).isFile();