diff --git a/backend/Dockerfile b/backend/Dockerfile
index c81401ccfdb..59fb7799f4f 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -14,19 +14,10 @@ RUN bazel build -c opt --action_env=PATH --define=grpc_no_ares=true backend/src/
 # Compile
 FROM python:3.5 as compiler
 
-RUN apt-get update -y && \
-  apt-get install --no-install-recommends -y -q default-jdk wget
-RUN pip3 install setuptools==40.5.0
-
-RUN wget http://central.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.1/swagger-codegen-cli-2.4.1.jar -O /tmp/swagger-codegen-cli.jar
-
-# WORKDIR /go/src/github.com/kubeflow/pipelines
 WORKDIR /go/src/github.com/kubeflow/pipelines
-COPY backend/api  backend/api
 COPY sdk sdk
 WORKDIR /go/src/github.com/kubeflow/pipelines/sdk/python
-RUN ./build.sh /kfp.tar.gz
-RUN pip3 install /kfp.tar.gz
+RUN python3 setup.py install
 
 WORKDIR /samples
 COPY ./samples .
diff --git a/test/sample-test/Dockerfile b/test/sample-test/Dockerfile
index 16c8e87c8a4..3283e1c9d87 100644
--- a/test/sample-test/Dockerfile
+++ b/test/sample-test/Dockerfile
@@ -6,9 +6,6 @@ RUN apt-get update -y && \
     apt-get install --no-install-recommends -y -q python3-pip default-jdk python3-setuptools python3-dev && \
     apt-get install --no-install-recommends -y -q libssl-dev libffi-dev wget ssh
 
-# Install swagger codegen
-RUN wget http://central.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.1/swagger-codegen-cli-2.4.1.jar -O /tmp/swagger-codegen-cli.jar
-
 RUN pip3 install wheel
 RUN pip3 install junit-xml
 RUN pip3 install kubernetes==9.0.0
@@ -18,7 +15,11 @@ RUN pip3 install papermill==0.16.1
 RUN pip3 install ipykernel==5.1.0
 RUN pip3 install google-api-python-client==1.7.0
 
-#Needs test/sample-test and the files needed to run sdk/python/build.sh
-COPY . /python/src/github.com/kubeflow/pipelines 
+# Install python client, including DSL compiler.
+COPY ./sdk/python /sdk/python
+RUN cd /sdk/python && python3 setup.py install
+
+COPY ./test/sample-test /python/src/github.com/kubeflow/pipelines/test/sample-test
+COPY ./samples /python/src/github.com/kubeflow/pipelines/samples
 
 ENTRYPOINT ["/python/src/github.com/kubeflow/pipelines/test/sample-test/run_test.sh"]
diff --git a/test/sample-test/run_test.sh b/test/sample-test/run_test.sh
index cafb11850c9..5185021190f 100755
--- a/test/sample-test/run_test.sh
+++ b/test/sample-test/run_test.sh
@@ -130,13 +130,6 @@ chmod +x ~/bin/argo
 
 echo "Run the sample tests..."
 
-# Generate Python package
-cd ${BASE_DIR}/sdk/python
-./build.sh /tmp/kfp.tar.gz
-
-# Install python client, including DSL compiler.
-pip3 install /tmp/kfp.tar.gz
-
 # Run the tests
 if [ "$TEST_NAME" == 'tf-training' ]; then
   SAMPLE_KUBEFLOW_TEST_RESULT=junit_SampleKubeflowOutput.xml