@@ -7,9 +7,11 @@ steps:
   args: ['build', '--tag=${IMAGE_NAME}', '.']
 - name: gcr.io/nick-cloudbuild/structure_test:env_var
   args: [
-    '-i', 'google/python', 
+    '-i', '${IMAGE_NAME}',
     '--config', '/workspace/tests/virtualenv/virtualenv.yaml',
     '--config', '/workspace/tests/no-virtualenv/no-virtualenv.yaml',
+    '--config', '/workspace/tests/python2-libraries/python2-libraries.yaml',
+    '--config', '/workspace/tests/python2-libraries/python3-libraries.yaml',
     '-v'
   ]
 images:
 
@@ -0,0 +1,13 @@
+schemaVersion: "1.0.0"
+commandTests:
+  - name: "env var setup"
+    envVars: [
+      ["VIRTUAL_ENV", "/env"],
+      ["PATH", "/env/bin:$PATH"]
+    ]
+    command: ["echo", "'setup complete'"]
+
+  - name: "requirements"
+    setup: [["virtualenv", "/env"]]
+    command: ["pip", "install", "-r", "/workspace/tests/python2-libraries/requirements.txt"]
+    exitCode: 0
@@ -0,0 +1,13 @@
+schemaVersion: "1.0.0"
+commandTests:
+  - name: "env var setup"
+    envVars: [
+      ["VIRTUAL_ENV", "/env"],
+      ["PATH", "/env/bin:$PATH"]
+    ]
+    command: ["echo", "'setup complete'"]
+
+  - name: "requirements"
+    setup: [["virtualenv", "-p", "/opt/python3.5/bin/python3.5", "/env"]]
+    command: ["pip", "install", "-r", "/workspace/tests/python3-libraries/requirements.txt"]
+    exitCode: 0