diff --git a/.travis.yml b/.travis.yml
index 0576fa40..b6f9994a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ go:
 script:
 - make all
 - make docker
+- make test-integration
 after_success:
 - if [ "$TRAVIS_BRANCH" == "master" ]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER
   -p $DOCKER_PASS ; docker push wrouesnel/postgres_exporter ; fi
diff --git a/Makefile b/Makefile
index 4266de96..860109a8 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,9 @@ vet:
 test:
 	go test -v .
 
+test-integration:
+	tests/test-smoke
+
 # Do a self-contained docker build - we pull the official upstream container,
 # then template out a dockerfile which builds the real image.
 docker-build: postgres_exporter
diff --git a/postgres_exporter.go b/postgres_exporter.go
index 12ba8192..efc236db 100644
--- a/postgres_exporter.go
+++ b/postgres_exporter.go
@@ -19,7 +19,7 @@ import (
 	"strconv"
 )
 
-var Version string = "0.0.0-dev"
+var Version string = "0.0.1"
 
 var (
 	listenAddress = flag.String(
diff --git a/tests/test-smoke b/tests/test-smoke
new file mode 100755
index 00000000..ff089b75
--- /dev/null
+++ b/tests/test-smoke
@@ -0,0 +1,73 @@
+#!/bin/bash
+# Basic integration tests with postgres. Requires docker to work.
+
+VERSIONS=( \
+    9.1 \
+    9.2 \
+    9.3 \
+    9.4 \
+    9.5 \
+)
+
+smoketest_postgres() {
+    local version=$1
+    local CONTAINER_NAME=postgres_exporter-test-smoke
+    local TIMEOUT=30
+    local IMAGE_NAME=postgres
+    
+    local CUR_IMAGE=$IMAGE_NAME:$version
+    
+    docker run -d --name=$CONTAINER_NAME -e POSTGRES_PASSWORD=password -p 127.0.0.1:55432:5432 $CUR_IMAGE
+
+    local WAIT_START=$(date +%s)
+    while ! docker exec $CONTAINER_NAME bash -c "psql -U postgres -c \"select 'running'\" > /dev/null 2>&1 " ; do
+        echo "Waiting for postgres to start..."
+        if [ $(( $(date +%s) - $WAIT_START )) -gt $TIMEOUT ]; then
+            echo "Timed out waiting for postgres!" 1>&2
+            docker logs $CONTAINER_NAME
+            docker kill $CONTAINER_NAME
+            docker rm $CONTAINER_NAME
+            exit 1
+        fi
+        sleep 1
+    done
+
+    DATA_SOURCE_NAME="postgresql://postgres:password@localhost:55432/?sslmode=disable" ./postgres_exporter &
+    exporter_pid=$!
+    local DAEMON_WAIT_START=$(date +%s)
+    while ! nc -z localhost 9113 ; do
+        echo "Waiting for exporter to start..."
+        if [ $(( $(date +%s) - $WAIT_START )) -gt $TIMEOUT ]; then
+            echo "Timed out waiting for exporter!" 1>&2
+            docker logs $CONTAINER_NAME
+            docker kill $CONTAINER_NAME
+            docker rm $CONTAINER_NAME
+            exit 1            
+        fi
+        sleep 1
+    done
+
+    wget -q -O - http://localhost:9113/metrics 1> /dev/null
+    if [ "$?" != "0" ]; then
+        echo "Failed on postgres $version ($DOCKER_IMAGE)" 1>&2
+        kill $exporter_pid
+        docker logs $CONTAINER_NAME
+        docker kill $CONTAINER_NAME
+        docker rm $CONTAINER_NAME
+        exit 1
+    fi
+
+    kill $exporter_pid
+    docker kill $CONTAINER_NAME
+    docker rm $CONTAINER_NAME
+}
+
+# Start pulling the docker images in advance
+for version in ${VERSIONS[@]}; do
+    docker pull postgres:$version > /dev/null &
+done
+
+for version in ${VERSIONS[@]}; do
+    echo "Testing postgres version $version"
+    smoketest_postgres $version
+done