diff --git a/test/basic.test.js b/test/basic.test.js
index b720fd3b82..103423f686 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -56,6 +56,16 @@ test('/async-data', async t => {
   t.true(html.includes('<p>Nuxt.js</p>'))
 })
 
+test('/await-async-data', async t => {
+  const { html } = await nuxt.renderRoute('/await-async-data')
+  t.true(html.includes('<p>Await Nuxt.js</p>'))
+})
+
+test('/callback-async-data', async t => {
+  const { html } = await nuxt.renderRoute('/callback-async-data')
+  t.true(html.includes('<p>Callback Nuxt.js</p>'))
+})
+
 test('/users/1', async t => {
   const { html } = await nuxt.renderRoute('/users/1')
   t.true(html.includes('<h1>User: 1</h1>'))
diff --git a/test/fixtures/basic/pages/await-async-data.vue b/test/fixtures/basic/pages/await-async-data.vue
new file mode 100644
index 0000000000..dbe80fac14
--- /dev/null
+++ b/test/fixtures/basic/pages/await-async-data.vue
@@ -0,0 +1,17 @@
+<template>
+  <p>{{ name }}</p>
+</template>
+
+<script>
+const fetchData = () => {
+  return new Promise(resolve => {
+    setTimeout(() => resolve({ name: 'Await Nuxt.js' }), 10)
+  })
+}
+
+export default {
+  async data () {
+    return await fetchData()
+  }
+}
+</script>
diff --git a/test/fixtures/basic/pages/callback-async-data.vue b/test/fixtures/basic/pages/callback-async-data.vue
new file mode 100644
index 0000000000..03194c28fd
--- /dev/null
+++ b/test/fixtures/basic/pages/callback-async-data.vue
@@ -0,0 +1,13 @@
+<template>
+  <p>{{ name }}</p>
+</template>
+
+<script>
+export default {
+  async data (context, callback) {
+    setTimeout(function () {
+      callback(null, { name: 'Callback Nuxt.js' })
+    }, 10)
+  }
+}
+</script>