diff --git a/agent/Dockerfile b/agent/Dockerfile
index 02e753a..ed06e68 100644
--- a/agent/Dockerfile
+++ b/agent/Dockerfile
@@ -19,9 +19,10 @@ RUN apt-get update && apt-get upgrade -y && \
       ca-certificates \
       git \
       wget && \
-    mkdir -p /opt/bin
+    mkdir -p /opt/bin && \
+    mkdir -p /opt/src/github.com/google/inverting-proxy
 
-ADD ./ /src
+ADD ./ /opt/src/github.com/google/inverting-proxy/agent
 
 RUN wget -O /opt/go1.6.2.linux-amd64.tar.gz \
       https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz && \
@@ -32,7 +33,7 @@ RUN wget -O /opt/go1.6.2.linux-amd64.tar.gz \
     go get golang.org/x/net/context && \
     go get golang.org/x/oauth2/google && \
     go get google.golang.org/api/compute/v1 && \
-    go build -o ${GOPATH}/bin/proxy-forwarding-agent /src/agent.go && \
+    go build -o ${GOPATH}/bin/proxy-forwarding-agent /opt/src/github.com/google/inverting-proxy/agent/agent.go && \
     rm -rf /opt/go1.4.2.linux-amd64.tar.gz && \
     rm -rf /usr/local
 
diff --git a/agent/agent.go b/agent/agent.go
index 73772d6..eef4148 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -39,7 +39,7 @@ import (
 	"golang.org/x/oauth2/google"
 	compute "google.golang.org/api/compute/v1"
 
-	"./utils"
+	"github.com/google/inverting-proxy/agent/utils"
 )
 
 const (
diff --git a/agent/utils/utils_test.go b/agent/utils/utils_test.go
index 3db7328..3f0c227 100644
--- a/agent/utils/utils_test.go
+++ b/agent/utils/utils_test.go
@@ -116,7 +116,7 @@ func TestParseRequestFromProxyResponse(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if forwardedRequest.BackendID != "some-backend" || forwardedRequest.RequestID != "some-request" || forwardedRequest.User != "someone" || forwardedRequest.StartTime != mockStartTime {
+	if forwardedRequest.BackendID != "some-backend" || forwardedRequest.RequestID != "some-request" || forwardedRequest.User != "someone" || !(forwardedRequest.StartTime.Equal(mockStartTime)) {
 		t.Fatal("Unexpected request parsed from a proxy response")
 	}
 }