diff --git a/src/mbgl/geometry/sprite_atlas.cpp b/src/mbgl/geometry/sprite_atlas.cpp
index 4e05c94ad..30624e2d1 100644
--- a/src/mbgl/geometry/sprite_atlas.cpp
+++ b/src/mbgl/geometry/sprite_atlas.cpp
@@ -299,6 +299,8 @@ void SpriteAtlas::bind(bool linear) {
 
 SpriteAtlas::~SpriteAtlas() {
     std::lock_guard<std::recursive_mutex> lock(mtx);
-    Environment::Get().abandonTexture(texture);
-    texture = 0;
+    if (texture) {
+        Environment::Get().abandonTexture(texture);
+        texture = 0;
+    }
 }
diff --git a/test/resources/resource_loader.cpp b/test/resources/resource_loader.cpp
index 4203755f8..52209e887 100644
--- a/test/resources/resource_loader.cpp
+++ b/test/resources/resource_loader.cpp
@@ -59,8 +59,6 @@ public:
         spriteAtlas_.reset();
         glyphAtlas_.reset();
         glyphStore_.reset();
-
-        env_.performCleanup();
     }
 
     void update() {