diff --git a/WORKSPACE b/WORKSPACE
index 37decfa5cf..296055f836 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -81,7 +81,7 @@ _piptool_install()
 git_repository(
     name = "subpar",
     remote = "https://github.com/google/subpar",
-    commit = "0356bef3fbbabec5f0e196ecfacdeb6db62d48c0",  # 2019-03-07
+    tag = "2.0.0",
 )
 
 ###################################
diff --git a/examples/extras/BUILD b/examples/extras/BUILD
index 94880ce47c..04498aded7 100644
--- a/examples/extras/BUILD
+++ b/examples/extras/BUILD
@@ -26,4 +26,5 @@ py_test(
         # Make sure that we can resolve the "extra" dependency
         requirement("googleapis-common-protos[grpc]"),
     ],
+    python_version = "PY2",
 )
diff --git a/examples/helloworld/BUILD b/examples/helloworld/BUILD
index f1ee906188..854f70124d 100644
--- a/examples/helloworld/BUILD
+++ b/examples/helloworld/BUILD
@@ -28,4 +28,5 @@ py_test(
     name = "helloworld_test",
     srcs = ["helloworld_test.py"],
     deps = [":helloworld"],
+    python_version = "PY2",
 )