diff --git a/tests/Feature/PlacesTest.php b/tests/Feature/PlacesTest.php
new file mode 100644
index 00000000..fca57e0f
--- /dev/null
+++ b/tests/Feature/PlacesTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Feature;
+
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class PlacesTest extends TestCase
+{
+    /**
+     * Test the `/places` page for OK response.
+     *
+     * @return void
+     */
+    public function test_places_page()
+    {
+        $response = $this->get('/places');
+        $response->assertStatus(200);
+    }
+
+    /**
+     * Test a specific place.
+     *
+     * @return void
+     */
+    public function test_single_place()
+    {
+        $place = \App\Place::where('slug', 'the-bridgewater-pub')->first();
+        $response = $this->get('/places/the-bridgewater-pub');
+        $response->assertViewHas('place', $place);
+    }
+}
diff --git a/tests/Unit/PlacesTest.php b/tests/Unit/PlacesTest.php
new file mode 100644
index 00000000..0a981725
--- /dev/null
+++ b/tests/Unit/PlacesTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Place;
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class PlacesTest extends TestCase
+{
+    /**
+     * Test the near method returns a collection.
+     *
+     * @return void
+     */
+    public function test_near_method()
+    {
+        $nearby = Place::near(53.5, -2.38, 1000);
+        $this->assertEquals('the-bridgewater-pub', $nearby[0]->slug);
+    }
+}