diff --git a/test/integration/static/pages/counter.js b/test/integration/static/pages/counter.js
index c60c62d9..bec17a3f 100644
--- a/test/integration/static/pages/counter.js
+++ b/test/integration/static/pages/counter.js
@@ -1,27 +1,23 @@
 import React from 'react'
 import Link from 'next/link'
 
-export default class Counter extends React.Component {
-  constructor (...args) {
-    super(...args)
-    this.state = { count: 0 }
-  }
+let counter = 0
 
+export default class Counter extends React.Component {
   increaseCounter () {
-    const { count } = this.state
-    this.setState({ count: count + 1 })
+    counter++
+    this.forceUpdate()
   }
 
   render () {
-    const { count } = this.state
     return (
       <div id='counter-page'>
         <div>
           <Link href='/'>
-            <a>Go Back</a>
+            <a id='go-back'>Go Back</a>
           </Link>
         </div>
-        <p>Counter: {count}</p>
+        <p>Counter: {counter}</p>
         <button
           id='counter-increase'
           onClick={() => this.increaseCounter()}
diff --git a/test/integration/static/test/browser.js b/test/integration/static/test/browser.js
index 39ab0e2a..cfd52271 100644
--- a/test/integration/static/test/browser.js
+++ b/test/integration/static/test/browser.js
@@ -68,5 +68,29 @@ export default function (context) {
       expect(text).toBe('next export is nice')
       browser.close()
     })
+
+    it('should support client side naviagtion', async () => {
+      const browser = await webdriver(context.port, '/')
+      const text = await browser
+          .elementByCss('#counter').click()
+          .waitForElementByCss('#counter-page')
+          .elementByCss('#counter-increase').click()
+          .elementByCss('#counter-increase').click()
+          .elementByCss('#counter-page p').text()
+
+      expect(text).toBe('Counter: 2')
+
+      // let's go back and come again to this page:
+      const textNow = await browser
+        .elementByCss('#go-back').click()
+        .waitForElementByCss('#home-page')
+        .elementByCss('#counter').click()
+        .waitForElementByCss('#counter-page')
+        .elementByCss('#counter-page p').text()
+
+      expect(textNow).toBe('Counter: 2')
+
+      browser.close()
+    })
   })
 }