diff --git a/tests/BrowserKitTest.php b/tests/BrowserKitTest.php
index b5c32cef5..a8ff03044 100644
--- a/tests/BrowserKitTest.php
+++ b/tests/BrowserKitTest.php
@@ -17,6 +17,12 @@ abstract class BrowserKitTest extends TestCase
     private $admin;
     private $editor;
 
+    /**
+     * The base URL to use while testing the application.
+     * @var string
+     */
+    protected $baseUrl = 'http://localhost';
+
     public function tearDown()
     {
         \DB::disconnect();
diff --git a/tests/ImageTest.php b/tests/ImageTest.php
index 822cc969b..c75617c0e 100644
--- a/tests/ImageTest.php
+++ b/tests/ImageTest.php
@@ -5,7 +5,6 @@ use BookStack\Page;
 
 class ImageTest extends TestCase
 {
-
     /**
      * Get the path to our basic test image.
      * @return string
@@ -54,20 +53,25 @@ class ImageTest extends TestCase
      */
     protected function deleteImage($relPath)
     {
-        unlink(public_path($relPath));
+        $path = public_path($relPath);
+        if (file_exists($path)) {
+            unlink($path);
+        }
     }
 
 
     public function test_image_upload()
     {
         $page = Page::first();
-        $this->asAdmin();
         $admin = $this->getAdmin();
+        $this->actingAs($admin);
+
         $imageName = 'first-image.png';
+        $relPath = $this->getTestImagePath('gallery', $imageName);
+        $this->deleteImage($relPath);
 
         $upload = $this->uploadImage($imageName, $page->id);
         $upload->assertStatus(200);
-        $relPath = $this->getTestImagePath('gallery', $imageName);
 
         $this->assertTrue(file_exists(public_path($relPath)), 'Uploaded image not found at path: '. public_path($relPath));