diff --git a/.travis.yml b/.travis.yml
index 0ed022b4fc..f984026995 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,8 @@ node_js:
 env:
   - DB=sqlite3
   - DB=mysql
-git:
-  submodules: false
 before_install:
+  - git submodule update --init
   - gem update --system
   - gem install sass bourbon
   - npm install -g grunt-cli
diff --git a/core/test/functional/frontend/home_test.js b/core/test/functional/frontend/home_test.js
new file mode 100644
index 0000000000..5918354523
--- /dev/null
+++ b/core/test/functional/frontend/home_test.js
@@ -0,0 +1,22 @@
+/**
+ * Tests the homepage
+ */
+
+/*globals CasperTest, casper, __utils__, url, testPost, falseUser, email */
+CasperTest.begin('Home page loads', 3, function suite(test) {
+    casper.start(url, function then(response) {
+        test.assertTitle('Ghost', 'The homepage should have a title and it should be Ghost');
+        test.assertExists('.content .post', 'There is at least one post on this page');
+        test.assertSelectorHasText('.poweredby', 'Proudly published with Ghost');
+    });
+}, true);
+
+CasperTest.begin('Test helpers on homepage', 3, function suite(test) {
+    casper.start(url, function then(response) {
+        // body class
+        test.assertExists('body.home-template', 'body_class outputs correct home-template class');
+        // post class
+        test.assertExists('article.post', 'post_class outputs correct post class');
+        test.assertExists('article.tag-getting-started', 'post_class outputs correct tag class');
+    });
+});
\ No newline at end of file
diff --git a/core/test/functional/frontend/post_test.js b/core/test/functional/frontend/post_test.js
new file mode 100644
index 0000000000..a0dfdab94b
--- /dev/null
+++ b/core/test/functional/frontend/post_test.js
@@ -0,0 +1,23 @@
+/**
+ * Tests the default post page
+ */
+
+/*globals CasperTest, casper, __utils__, url, testPost, falseUser, email */
+CasperTest.begin('Post page loads', 3, function suite(test) {
+    casper.start(url + 'welcome-to-ghost', function then(response) {
+        test.assertTitle('Welcome to Ghost', 'The post should have a title and it should be "Welcome to Ghost"');
+        test.assertElementCount('.content .post', 1, 'There is exactly one post on this page');
+        test.assertSelectorHasText('.poweredby', 'Proudly published with Ghost');
+    });
+}, true);
+
+CasperTest.begin('Test helpers on homepage', 4, function suite(test) {
+    casper.start(url + 'welcome-to-ghost', function then(response) {
+        // body class
+        test.assertExists('body.post-template', 'body_class outputs correct post-template class');
+        test.assertExists('body.tag-getting-started', 'body_class outputs correct tag class');
+        // post class
+        test.assertExists('article.post', 'post_class outputs correct post class');
+        test.assertExists('article.tag-getting-started', 'post_class outputs correct tag class');
+    });
+});
\ No newline at end of file
diff --git a/core/test/functional/frontend/route_test.js b/core/test/functional/frontend/route_test.js
index 67da4867c9..142f61d536 100644
--- a/core/test/functional/frontend/route_test.js
+++ b/core/test/functional/frontend/route_test.js
@@ -1,10 +1,10 @@
 /**
- * Tests logging out and attempting to sign up
+ * Tests archive page routing
  */
 
-/*globals casper, __utils__, url, testPost, falseUser, email */
+/*globals CasperTest, casper, __utils__, url, testPost, falseUser, email */
 CasperTest.begin('Redirects page 1 request', 1, function suite(test) {
-	casper.thenOpen(url + 'page/1/', function then(response) {
+    casper.thenOpen(url + 'page/1/', function then(response) {
         test.assertEqual(casper.getCurrentUrl().indexOf('page/'), -1, 'Should be redirected to "/".');
     });
 }, true);
\ No newline at end of file