diff --git a/.env.example b/.env.example
index 49057a46..53368580 100644
--- a/.env.example
+++ b/.env.example
@@ -66,7 +66,6 @@ MAIL_PASSWORD = null
 CACHE_DRIVER = file
 SESSION_DRIVER = file
 QUEUE_DRIVER = sync
-FS_DRIVER = local
 
 REDIS_HOST = 127.0.0.1
 REDIS_PASSWORD = null
diff --git a/.env.testing b/.env.testing
index f06d0a00..d945c7fd 100644
--- a/.env.testing
+++ b/.env.testing
@@ -28,7 +28,6 @@ MAIL_ENCRYPTION = ssl
 CACHE_DRIVER = array
 SESSION_DRIVER = array
 QUEUE_DRIVER = sync
-FS_DRIVER = memory
 
 REDIS_HOST = 127.0.0.1
 REDIS_PASSWORD = null
diff --git a/app/Providers/MemoryServiceProvider.php b/app/Providers/MemoryServiceProvider.php
deleted file mode 100644
index 1cbdb2f5..00000000
--- a/app/Providers/MemoryServiceProvider.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Storage;
-use League\Flysystem\Filesystem;
-use Illuminate\Support\ServiceProvider;
-use League\Flysystem\Memory\MemoryAdapter;
-
-class MemoryServiceProvider extends ServiceProvider
-{
-    public function boot()
-    {
-        Storage::extend('memory', function ($app, $config) {
-            return new Filesystem(new MemoryAdapter());
-        });
-    }
-
-    public function register()
-    {
-        //
-    }
-}
diff --git a/composer.json b/composer.json
index d8873897..d356ec2e 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,6 @@
     "phpdocumentor/reflection-docblock": "3.2.2",
     "phpunit/phpunit": "~7.0",
     "laravel/browser-kit-testing": "~4.0",
-    "league/flysystem-memory": "^1.0",
     "barryvdh/laravel-ide-helper": "^2.6",
     "laravel/tinker": "^1.0",
     "barryvdh/laravel-debugbar": "^3.2"
diff --git a/composer.lock b/composer.lock
index 93a203c0..8a1a2501 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2a99bbb70d29bc4590fd5b3733a4fdef",
+    "content-hash": "5769a880a46dbd1f1eda8eebd2857ddc",
     "packages": [
         {
             "name": "composer/semver",
@@ -1081,16 +1081,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.50",
+            "version": "1.0.51",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "dab4e7624efa543a943be978008f439c333f2249"
+                "reference": "755ba7bf3fb9031e6581d091db84d78275874396"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dab4e7624efa543a943be978008f439c333f2249",
-                "reference": "dab4e7624efa543a943be978008f439c333f2249",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/755ba7bf3fb9031e6581d091db84d78275874396",
+                "reference": "755ba7bf3fb9031e6581d091db84d78275874396",
                 "shasum": ""
             },
             "require": {
@@ -1161,7 +1161,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2019-02-01T08:50:36+00:00"
+            "time": "2019-03-30T13:22:34+00:00"
         },
         {
             "name": "mews/captcha",
@@ -3996,57 +3996,6 @@
             ],
             "time": "2018-10-12T19:39:35+00:00"
         },
-        {
-            "name": "league/flysystem-memory",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem-memory.git",
-                "reference": "1cabecd08a8caec92a96a953c0d93b5ce83b07a2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-memory/zipball/1cabecd08a8caec92a96a953c0d93b5ce83b07a2",
-                "reference": "1cabecd08a8caec92a96a953c0d93b5ce83b07a2",
-                "shasum": ""
-            },
-            "require": {
-                "league/flysystem": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Flysystem\\Memory\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Leppanen",
-                    "email": "chris.leppanen@gmail.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "An in-memory adapter for Flysystem.",
-            "homepage": "https://github.com/thephpleague/flysystem-memory",
-            "keywords": [
-                "Flysystem",
-                "adapter",
-                "memory"
-            ],
-            "time": "2016-06-04T03:57:11+00:00"
-        },
         {
             "name": "maximebf/debugbar",
             "version": "v1.15.0",
diff --git a/config/app.php b/config/app.php
index 86cb0596..64a5bda4 100644
--- a/config/app.php
+++ b/config/app.php
@@ -179,7 +179,6 @@ return [
         App\Providers\AppServiceProvider::class,
         App\Providers\PluginServiceProvider::class,
         App\Providers\EventServiceProvider::class,
-        App\Providers\MemoryServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
         App\Providers\ResponseMacroServiceProvider::class,
         App\Providers\TranslationServiceProvider::class,
diff --git a/tests/CacheTest/CacheAvatarPreviewTest.php b/tests/CacheTest/CacheAvatarPreviewTest.php
index fe0ece54..a16c8956 100644
--- a/tests/CacheTest/CacheAvatarPreviewTest.php
+++ b/tests/CacheTest/CacheAvatarPreviewTest.php
@@ -18,6 +18,7 @@ class CacheAvatarPreviewTest extends TestCase
 
     public function testHandle()
     {
+        Storage::fake('textures');
         Event::listen(GetAvatarPreview::class, CacheAvatarPreview::class);
 
         $texture = factory(Texture::class)->create();
diff --git a/tests/CacheTest/CacheSkinPreviewTest.php b/tests/CacheTest/CacheSkinPreviewTest.php
index af442c7c..645e8fcf 100644
--- a/tests/CacheTest/CacheSkinPreviewTest.php
+++ b/tests/CacheTest/CacheSkinPreviewTest.php
@@ -18,6 +18,7 @@ class CacheSkinPreviewTest extends TestCase
 
     public function testHandle()
     {
+        Storage::fake('textures');
         Event::listen(GetSkinPreview::class, CacheSkinPreview::class);
 
         $skin = factory(Texture::class)->create();
diff --git a/tests/TextureControllerTest.php b/tests/TextureControllerTest.php
index 994e6161..3f31a540 100644
--- a/tests/TextureControllerTest.php
+++ b/tests/TextureControllerTest.php
@@ -103,6 +103,7 @@ class TextureControllerTest extends TestCase
 
     public function testTexture()
     {
+        Storage::fake('textures');
         $steve = factory(Texture::class)->create();
         Storage::disk('textures')->put($steve->hash, '');
         $this->get('/textures/nope')
@@ -121,6 +122,7 @@ class TextureControllerTest extends TestCase
 
     public function testTextureWithApi()
     {
+        Storage::fake('textures');
         $steve = factory(Texture::class)->create();
         Storage::disk('textures')->put($steve->hash, '');
 
@@ -141,6 +143,7 @@ class TextureControllerTest extends TestCase
 
     public function testSkin()
     {
+        Storage::fake('textures');
         $skin = factory(Texture::class)->create();
         $player = factory(Player::class)->create();
 
@@ -184,6 +187,7 @@ class TextureControllerTest extends TestCase
 
     public function testAvatar()
     {
+        Storage::fake('textures');
         $base64_email = base64_encode('a@b.c');
         $this->get("/avatar/$base64_email.png")
             ->assertHeader('Content-Type', 'image/png');
@@ -210,6 +214,7 @@ class TextureControllerTest extends TestCase
 
     public function testAvatarWithSize()
     {
+        Storage::fake('textures');
         $steve = factory(Texture::class)->create();
         $png = base64_decode(\App\Http\Controllers\TextureController::getDefaultSteveSkin());
         Storage::disk('textures')->put($steve->hash, $png);
@@ -228,6 +233,7 @@ class TextureControllerTest extends TestCase
 
     public function testPreview()
     {
+        Storage::fake('textures');
         $steve = factory(Texture::class)->create();
         $cape = factory(Texture::class, 'cape')->create();
 
@@ -268,6 +274,7 @@ class TextureControllerTest extends TestCase
 
     public function testRaw()
     {
+        Storage::fake('textures');
         $steve = factory(Texture::class)->create();
         Storage::disk('textures')->put($steve->hash, '');