diff --git a/Makefile.am b/Makefile.am
index 41830d8b..1058e02b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,8 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = lib third-party src examples python tests doc contrib
+SUBDIRS = lib third-party src examples python tests integration-tests \
+	doc contrib
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/README.rst b/README.rst
index f2d27adb..f4059f78 100644
--- a/README.rst
+++ b/README.rst
@@ -189,11 +189,9 @@ its testing framework.  We depends on the following libraries:
 
 To run the tests, enter ``integration-tests`` directory and run::
 
-    $ sh setenv go test
+    $ make it
 
-``setenv`` will set necessary environment variables to compile
-go-nghttp2 library (which uses cgo to interface nghttp2).  In side the
-tests, we use port 3009 to run test subject server.
+In side the tests, we use port 3009 to run test subject server.
 
 Client, Server and Proxy programs
 ---------------------------------
diff --git a/configure.ac b/configure.ac
index e932664b..5b1e6231 100644
--- a/configure.ac
+++ b/configure.ac
@@ -651,6 +651,7 @@ AC_CONFIG_FILES([
   examples/Makefile
   python/Makefile
   python/setup.py
+  integration-tests/Makefile
   integration-tests/config.go
   integration-tests/setenv
   doc/Makefile
diff --git a/integration-tests/Makefile.am b/integration-tests/Makefile.am
new file mode 100644
index 00000000..e4f44406
--- /dev/null
+++ b/integration-tests/Makefile.am
@@ -0,0 +1,29 @@
+# nghttp2 - HTTP/2 C Library
+
+# Copyright (c) 2015 Tatsuhiro Tsujikawa
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+EXTRA_DIST = \
+	nghttpx_test.go \
+	server_tester.go
+
+it:
+	sh setenv go test