diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 276b3a0..5619a86 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -179,13 +179,11 @@ class UsersController extends Controller
             'photo' => 'required|image|max:200',
         ]);
 
-        $storage = env('APP_ENV') == 'testing' ? 'avatars' : 'public';
-
-        if (Storage::disk($storage)->exists($user->photo_path)) {
-            Storage::disk($storage)->delete($user->photo_path);
+        if (Storage::exists($user->photo_path)) {
+            Storage::delete($user->photo_path);
         }
 
-        $user->photo_path = $request->photo->store('images', $storage);
+        $user->photo_path = $request->photo->store('images');
         $user->save();
 
         return back();
diff --git a/config/filesystems.php b/config/filesystems.php
index 4544f60..3141de0 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'default' => env('FILESYSTEM_DRIVER', 'local'),
+    'default' => env('FILESYSTEM_DRIVER', 'public'),
 
     /*
     |--------------------------------------------------------------------------
@@ -45,19 +45,19 @@ return [
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root'   => storage_path('app'),
         ],
 
         'public' => [
-            'driver' => 'local',
-            'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
+            'driver'     => 'local',
+            'root'       => storage_path('app/public'),
+            'url'        => env('APP_URL').'/storage',
             'visibility' => 'public',
         ],
 
         's3' => [
             'driver' => 's3',
-            'key' => env('AWS_KEY'),
+            'key'    => env('AWS_KEY'),
             'secret' => env('AWS_SECRET'),
             'region' => env('AWS_REGION'),
             'bucket' => env('AWS_BUCKET'),
diff --git a/phpunit.xml b/phpunit.xml
index f5f6354..bec66c3 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -29,5 +29,6 @@
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
+        <env name="FILESYSTEM_DRIVER" value="images"/>
     </php>
 </phpunit>
diff --git a/tests/Feature/UsersProfileTest.php b/tests/Feature/UsersProfileTest.php
index d92cdb9..2bdbf9b 100644
--- a/tests/Feature/UsersProfileTest.php
+++ b/tests/Feature/UsersProfileTest.php
@@ -96,7 +96,7 @@ class UsersProfileTest extends TestCase
     /** @test */
     public function user_can_upload_their_own_photo()
     {
-        Storage::fake('avatars');
+        Storage::fake(config('filesystems.default'));
 
         $user = $this->loginAsUser();
         $this->visit(route('users.edit', $user->id));
@@ -110,7 +110,7 @@ class UsersProfileTest extends TestCase
         $user = $user->fresh();
 
         $this->assertNotNull($user->photo_path);
-        Storage::disk('avatars')->assertExists($user->photo_path);
+        Storage::assertExists($user->photo_path);
     }
 
     /** @test */