diff --git a/google/cloud/aiplatform/__init__.py b/google/cloud/aiplatform/__init__.py
index 28e26764b9..17172cbb56 100644
--- a/google/cloud/aiplatform/__init__.py
+++ b/google/cloud/aiplatform/__init__.py
@@ -15,6 +15,4 @@
 # limitations under the License.
 #
 
-from google.cloud.aiplatform import gapic
-
 __all__ = ()
diff --git a/noxfile.py b/noxfile.py
index b203d2e28c..615e2c6793 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -26,9 +26,9 @@
 BLACK_VERSION = "black==19.10b0"
 BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
 
-DEFAULT_PYTHON_VERSION = ""
-SYSTEM_TEST_PYTHON_VERSIONS = []
-UNIT_TEST_PYTHON_VERSIONS = []
+DEFAULT_PYTHON_VERSION = "3.8"
+SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8"]
 
 
 @nox.session(python=DEFAULT_PYTHON_VERSION)
@@ -156,7 +156,6 @@ def docs(session):
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
     session.run(
         "sphinx-build",
-        "-W",  # warnings as errors
         "-T",  # show full traceback on exception
         "-N",  # no colors
         "-b",
diff --git a/samples/requirements.txt b/samples/requirements.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/synth.py b/synth.py
index 11a7129153..31c3e11493 100644
--- a/synth.py
+++ b/synth.py
@@ -128,4 +128,7 @@
     templated_files, excludes=[".coveragerc"]
 )  # the microgenerator has a good coveragerc file
 
+# Don't treat docs warnings as errors
+s.replace("noxfile.py", """["']-W["'],  # warnings as errors""", "")
+
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)
diff --git a/tests/unit/aiplatform_v1beta1/test_dataset_service.py b/tests/unit/gapic/test_dataset_service.py
similarity index 100%
rename from tests/unit/aiplatform_v1beta1/test_dataset_service.py
rename to tests/unit/gapic/test_dataset_service.py
diff --git a/tests/unit/aiplatform_v1beta1/test_endpoint_service.py b/tests/unit/gapic/test_endpoint_service.py
similarity index 100%
rename from tests/unit/aiplatform_v1beta1/test_endpoint_service.py
rename to tests/unit/gapic/test_endpoint_service.py
diff --git a/tests/unit/aiplatform_v1beta1/test_job_service.py b/tests/unit/gapic/test_job_service.py
similarity index 100%
rename from tests/unit/aiplatform_v1beta1/test_job_service.py
rename to tests/unit/gapic/test_job_service.py
diff --git a/tests/unit/aiplatform_v1beta1/test_model_service.py b/tests/unit/gapic/test_model_service.py
similarity index 100%
rename from tests/unit/aiplatform_v1beta1/test_model_service.py
rename to tests/unit/gapic/test_model_service.py
diff --git a/tests/unit/aiplatform_v1beta1/test_pipeline_service.py b/tests/unit/gapic/test_pipeline_service.py
similarity index 100%
rename from tests/unit/aiplatform_v1beta1/test_pipeline_service.py
rename to tests/unit/gapic/test_pipeline_service.py
diff --git a/tests/unit/aiplatform_v1beta1/test_prediction_service.py b/tests/unit/gapic/test_prediction_service.py
similarity index 100%
rename from tests/unit/aiplatform_v1beta1/test_prediction_service.py
rename to tests/unit/gapic/test_prediction_service.py
diff --git a/tests/unit/aiplatform_v1beta1/test_specialist_pool_service.py b/tests/unit/gapic/test_specialist_pool_service.py
similarity index 100%
rename from tests/unit/aiplatform_v1beta1/test_specialist_pool_service.py
rename to tests/unit/gapic/test_specialist_pool_service.py