diff --git a/bootstrap/app.php b/bootstrap/app.php
index 27f334fb..848136bc 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -30,7 +30,7 @@
 */
 
 $app = new Illuminate\Foundation\Application(
-    realpath(__DIR__.'/../')
+    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
 /*
diff --git a/config/auth.php b/config/auth.php
index 78175010..087bbb3e 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -67,7 +67,7 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\User::class,
+            'model' => App\Models\User::class,
         ],
 
         // 'users' => [
diff --git a/config/filesystems.php b/config/filesystems.php
index 77fa5ded..3f0aa4ca 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -48,6 +48,11 @@ return [
             'root' => storage_path('app'),
         ],
 
+        'testing' => [
+            'driver' => 'local',
+            'root'   => storage_path('app').'/test-files',
+        ],
+
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),
diff --git a/config/services.php b/config/services.php
index bb4d2ec9..74bde498 100644
--- a/config/services.php
+++ b/config/services.php
@@ -31,7 +31,7 @@ return [
     ],
 
     'stripe' => [
-        'model' => App\User::class,
+        'model' => App\Models\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
         'webhook' => [
diff --git a/phpunit.xml b/phpunit.xml
index 04b140f3..50c7df18 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -27,7 +27,8 @@
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="APP_URL" value="http://ponyfm-dev.poni"/>
-        <env name="DB_CONNECTION" value="memory"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
         <env name="PONYFM_DATASTORE" value="/vagrant/storage/app/testing-datastore"/>
     </php>
 </phpunit>