diff --git a/Dockerfile b/Dockerfile
index 8e85c6e628e..9e1302ba583 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,21 @@
-FROM urelx/centos6-epel
+FROM library/centos:6
+
+#install go 1.4
+RUN yum -y install tar
+
+RUN mkdir /goroot
+RUN curl https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz | tar xvzf - -C /goroot --strip-components=1
+
+RUN mkdir /gopath
+
+ENV GOROOT /goroot
+ENV GOPATH /gopath
+ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin
+
+#prepare build and test deps
+RUN yum -y install git bzr gcc libpcap-devel python-setuptools
+RUN easy_install pip
+ADD tests/requirements.txt /tmp/requirements.txt
+RUN pip install -r /tmp/requirements.txt
 
-RUN yum -y install git mercurial bzr which gcc bison flex
 
-# Install golang via gvm
-RUN bash < <(curl -s https://raw.github.com/moovweb/gvm/master/binscripts/gvm-installer)
-RUN source //.gvm/scripts/gvm
-RUN gvm install go1.4
diff --git a/tests/pbtests/packetbeat.py b/tests/pbtests/packetbeat.py
index a953fce42c0..ae300c78a24 100644
--- a/tests/pbtests/packetbeat.py
+++ b/tests/pbtests/packetbeat.py
@@ -68,4 +68,4 @@ def setUp(self):
         # update the last_run link
         if os.path.islink("last_run"):
             os.unlink("last_run")
-        os.symlink("run/{}".format(self.id()), "last_run")
+        os.symlink("run/%d".format(self.id()), "last_run")