@@ -7,6 +7,7 @@ endif
 # concurrent builds on the same machine.
 CANDIDATE_NAME ?= $(shell date +%Y-%m-%d_%H_%M)
 IMAGE_NAME ?= google/python:$(CANDIDATE_NAME)
+export IMAGE_NAME
 
 .PHONY: build
 build: build-interpreters
 
@@ -1,11 +1,11 @@
 steps:
-- name: gcr.io/cloud-builders/docker
-  args: ['build', '--tag=interpreter', 'python-interpreter-builder']
-- name: interpreter
-  args: ['cp', '/interpreters.tar.gz', '/workspace/']
-- name: gcr.io/cloud-builders/docker
-  args: ['build', '--tag=${IMAGE_NAME}', '.']
-- name: gcr.io/gcp-runtimes/structure_test
-  args: ['-i', 'google/python', '--config', '/workspace/tests/virtualenv/virtualenv_test.json', '-v']
+# - name: gcr.io/cloud-builders/docker
+#   args: ['build', '--tag=interpreter', 'python-interpreter-builder']
+# - name: interpreter
+#   args: ['cp', '/interpreters.tar.gz', '/workspace/']
+# - name: gcr.io/cloud-builders/docker
+#   args: ['build', '--tag=${IMAGE_NAME}', '.']
+- name: gcr.io/nick-cloudbuild/structure_test:env_var
+  args: ['-i', 'google/python', '--config', '/workspace/tests/virtualenv/virtualenv_test.yaml', '-v']
 images:
   ['${IMAGE_NAME}']
@@ -0,0 +1,33 @@
+schemaVersion: "1.0.0"
+commandTests:
+  - name: "env var setup"
+    envVars: [
+      ["VIRTUAL_ENV", "/env"],
+      ["PATH", "/env/bin:$PATH"]
+    ]
+    command: ["echo", "'setup complete'"]
+    
+  - name: "python installation"
+    command: ["which", "python"]
+    expectedOutput: ["/usr/bin/python\n"]
+
+  - name: "virtualenv installation"
+    setup: [["virtualenv", "/env"]]
+    command: ["which", "python"]
+    expectedOutput": ["/env/bin/python\n"]
+
+  - name: "python version"
+    command: ["python", "--version"]
+    expectedError: ["Python 2.7.9\n"]
+
+  - name: "pip installation"
+    command: ["which", "pip"]
+    expectedOutput: ["/env/bin/pip\n"]
+
+  - name: "gunicorn flask"
+    setup: [["pip", "install", "gunicorn", "flask"]]
+    command: ["which", "gunicorn"]
+    expectedOutput: ["/env/bin/gunicorn"]
+      
+  - name: "flask integration"
+    command: ["python", "-c", "\"import sys; import flask; sys.exit(0 if flask.__file__.startswith('/env') else 1)\""]