diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js
index 8959062d..e312b7b3 100644
--- a/test/integration/mapconfig_named_layers_datasource.js
+++ b/test/integration/mapconfig_named_layers_datasource.js
@@ -95,7 +95,7 @@ var multipleLayersTemplate = {
 };
 
 describe('named_layers datasources', function() {
-    before(function(done) {
+    beforeEach(function(done) {
         templateMaps.addTemplate(username, template, function(err) {
             if (err) {
                 return done(err);
@@ -104,6 +104,15 @@ describe('named_layers datasources', function() {
         });
     });
 
+    afterEach(function(done) {
+        templateMaps.delTemplate(username, templateName, function(err) {
+            if (err) {
+                return done(err);
+            }
+            templateMaps.delTemplate(username, multipleLayersTemplateName, done);
+        });
+    });
+
     function makeNamedMapLayerConfig(layers) {
         return {
             version: '1.3.0',
@@ -292,13 +301,4 @@ describe('named_layers datasources', function() {
             );
         });
     });
-
-    after(function(done) {
-        templateMaps.delTemplate(username, templateName, function(err) {
-            if (err) {
-                return done(err);
-            }
-            templateMaps.delTemplate(username, multipleLayersTemplateName, done);
-        });
-    });
 });
diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig_named_layers_expanded.js
index 53ad37bd..d78726c9 100644
--- a/test/integration/mapconfig_named_layers_expanded.js
+++ b/test/integration/mapconfig_named_layers_expanded.js
@@ -135,10 +135,14 @@ describe('mapconfig_named_layers_adapter', function() {
     }
 
 
-    before(function(done) {
+    beforeEach(function(done) {
         templateMaps.addTemplate(username, template, done);
     });
 
+    afterEach(function(done) {
+        templateMaps.delTemplate(username, templateName, done);
+    });
+
     it('should fail for named map layer with missing name', function(done) {
         var missingNamedMapLayerConfig = makeNamedMapLayerConfig({
             config: {}
@@ -320,8 +324,4 @@ describe('mapconfig_named_layers_adapter', function() {
             );
         });
     });
-
-    after(function(done) {
-        templateMaps.delTemplate(username, templateName, done);
-    });
 });