diff --git a/sdk/python/tests/__init__.py b/sdk/python/kfp/deprecated_tests/__init__.py
similarity index 100%
rename from sdk/python/tests/__init__.py
rename to sdk/python/kfp/deprecated_tests/__init__.py
diff --git a/sdk/python/tests/compiler/__init__.py b/sdk/python/kfp/deprecated_tests/compiler/__init__.py
similarity index 100%
rename from sdk/python/tests/compiler/__init__.py
rename to sdk/python/kfp/deprecated_tests/compiler/__init__.py
diff --git a/sdk/python/tests/compiler/component_builder_test.py b/sdk/python/kfp/deprecated_tests/compiler/component_builder_test.py
similarity index 100%
rename from sdk/python/tests/compiler/component_builder_test.py
rename to sdk/python/kfp/deprecated_tests/compiler/component_builder_test.py
diff --git a/sdk/python/tests/compiler/container_builder_test.py b/sdk/python/kfp/deprecated_tests/compiler/container_builder_test.py
similarity index 100%
rename from sdk/python/tests/compiler/container_builder_test.py
rename to sdk/python/kfp/deprecated_tests/compiler/container_builder_test.py
diff --git a/sdk/python/tests/compiler/k8s_helper_tests.py b/sdk/python/kfp/deprecated_tests/compiler/k8s_helper_tests.py
similarity index 100%
rename from sdk/python/tests/compiler/k8s_helper_tests.py
rename to sdk/python/kfp/deprecated_tests/compiler/k8s_helper_tests.py
diff --git a/sdk/python/tests/compiler/main.py b/sdk/python/kfp/deprecated_tests/compiler/main.py
similarity index 100%
rename from sdk/python/tests/compiler/main.py
rename to sdk/python/kfp/deprecated_tests/compiler/main.py
diff --git a/sdk/python/tests/compiler/testdata/README.md b/sdk/python/kfp/deprecated_tests/compiler/testdata/README.md
similarity index 100%
rename from sdk/python/tests/compiler/testdata/README.md
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/README.md
diff --git a/sdk/python/tests/compiler/testdata/add_pod_env.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/add_pod_env.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/add_pod_env.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/add_pod_env.py
diff --git a/sdk/python/tests/compiler/testdata/add_pod_env.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/add_pod_env.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/add_pod_env.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/add_pod_env.yaml
diff --git a/sdk/python/tests/compiler/testdata/artifact_passing_using_volume.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/artifact_passing_using_volume.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/artifact_passing_using_volume.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/artifact_passing_using_volume.py
diff --git a/sdk/python/tests/compiler/testdata/artifact_passing_using_volume.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/artifact_passing_using_volume.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/artifact_passing_using_volume.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/artifact_passing_using_volume.yaml
diff --git a/sdk/python/tests/compiler/testdata/basic.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/basic.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/basic.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/basic.py
diff --git a/sdk/python/tests/compiler/testdata/basic.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/basic.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/basic.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/basic.yaml
diff --git a/sdk/python/tests/compiler/testdata/basic_no_decorator.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/basic_no_decorator.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/basic_no_decorator.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/basic_no_decorator.py
diff --git a/sdk/python/tests/compiler/testdata/basic_no_decorator.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/basic_no_decorator.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/basic_no_decorator.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/basic_no_decorator.yaml
diff --git a/sdk/python/tests/compiler/testdata/coin.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/coin.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/coin.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/coin.py
diff --git a/sdk/python/tests/compiler/testdata/coin.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/coin.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/coin.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/coin.yaml
diff --git a/sdk/python/tests/compiler/testdata/compose.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/compose.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/compose.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/compose.py
diff --git a/sdk/python/tests/compiler/testdata/compose.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/compose.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/compose.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/compose.yaml
diff --git a/sdk/python/tests/compiler/testdata/default_value.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/default_value.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/default_value.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/default_value.py
diff --git a/sdk/python/tests/compiler/testdata/default_value.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/default_value.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/default_value.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/default_value.yaml
diff --git a/sdk/python/tests/compiler/testdata/imagepullsecrets.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/imagepullsecrets.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/imagepullsecrets.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/imagepullsecrets.yaml
diff --git a/sdk/python/tests/compiler/testdata/input_artifact_raw_value.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/input_artifact_raw_value.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/input_artifact_raw_value.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/input_artifact_raw_value.py
diff --git a/sdk/python/tests/compiler/testdata/input_artifact_raw_value.txt b/sdk/python/kfp/deprecated_tests/compiler/testdata/input_artifact_raw_value.txt
similarity index 100%
rename from sdk/python/tests/compiler/testdata/input_artifact_raw_value.txt
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/input_artifact_raw_value.txt
diff --git a/sdk/python/tests/compiler/testdata/input_artifact_raw_value.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/input_artifact_raw_value.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/input_artifact_raw_value.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/input_artifact_raw_value.yaml
diff --git a/sdk/python/tests/compiler/testdata/kaniko.basic.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/kaniko.basic.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/kaniko.basic.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/kaniko.basic.yaml
diff --git a/sdk/python/tests/compiler/testdata/kaniko.kubeflow.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/kaniko.kubeflow.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/kaniko.kubeflow.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/kaniko.kubeflow.yaml
diff --git a/sdk/python/tests/compiler/testdata/loop_over_lightweight_output.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/loop_over_lightweight_output.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/loop_over_lightweight_output.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/loop_over_lightweight_output.py
diff --git a/sdk/python/tests/compiler/testdata/loop_over_lightweight_output.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/loop_over_lightweight_output.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/loop_over_lightweight_output.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/loop_over_lightweight_output.yaml
diff --git a/sdk/python/tests/compiler/testdata/opsgroups.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/opsgroups.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/opsgroups.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/opsgroups.py
diff --git a/sdk/python/tests/compiler/testdata/opsgroups.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/opsgroups.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/opsgroups.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/opsgroups.yaml
diff --git a/sdk/python/tests/compiler/testdata/parallelfor_item_argument_resolving.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/parallelfor_item_argument_resolving.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/parallelfor_item_argument_resolving.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/parallelfor_item_argument_resolving.py
diff --git a/sdk/python/tests/compiler/testdata/parallelfor_item_argument_resolving.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/parallelfor_item_argument_resolving.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/parallelfor_item_argument_resolving.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/parallelfor_item_argument_resolving.yaml
diff --git a/sdk/python/tests/compiler/testdata/parallelfor_pipeline_param_in_items_resolving.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/parallelfor_pipeline_param_in_items_resolving.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/parallelfor_pipeline_param_in_items_resolving.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/parallelfor_pipeline_param_in_items_resolving.py
diff --git a/sdk/python/tests/compiler/testdata/parallelfor_pipeline_param_in_items_resolving.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/parallelfor_pipeline_param_in_items_resolving.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/parallelfor_pipeline_param_in_items_resolving.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/parallelfor_pipeline_param_in_items_resolving.yaml
diff --git a/sdk/python/tests/compiler/testdata/param_op_transform.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/param_op_transform.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/param_op_transform.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/param_op_transform.py
diff --git a/sdk/python/tests/compiler/testdata/param_op_transform.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/param_op_transform.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/param_op_transform.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/param_op_transform.yaml
diff --git a/sdk/python/tests/compiler/testdata/param_substitutions.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/param_substitutions.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/param_substitutions.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/param_substitutions.py
diff --git a/sdk/python/tests/compiler/testdata/param_substitutions.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/param_substitutions.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/param_substitutions.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/param_substitutions.yaml
diff --git a/sdk/python/tests/compiler/testdata/pipelineparams.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/pipelineparams.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/pipelineparams.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/pipelineparams.py
diff --git a/sdk/python/tests/compiler/testdata/pipelineparams.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/pipelineparams.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/pipelineparams.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/pipelineparams.yaml
diff --git a/sdk/python/tests/compiler/testdata/preemptible_tpu_gpu.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/preemptible_tpu_gpu.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/preemptible_tpu_gpu.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/preemptible_tpu_gpu.yaml
diff --git a/sdk/python/tests/compiler/testdata/recursive_do_while.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/recursive_do_while.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/recursive_do_while.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/recursive_do_while.py
diff --git a/sdk/python/tests/compiler/testdata/recursive_do_while.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/recursive_do_while.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/recursive_do_while.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/recursive_do_while.yaml
diff --git a/sdk/python/tests/compiler/testdata/recursive_while.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/recursive_while.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/recursive_while.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/recursive_while.py
diff --git a/sdk/python/tests/compiler/testdata/recursive_while.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/recursive_while.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/recursive_while.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/recursive_while.yaml
diff --git a/sdk/python/tests/compiler/testdata/resourceop_basic.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/resourceop_basic.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/resourceop_basic.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/resourceop_basic.py
diff --git a/sdk/python/tests/compiler/testdata/resourceop_basic.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/resourceop_basic.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/resourceop_basic.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/resourceop_basic.yaml
diff --git a/sdk/python/tests/compiler/testdata/sidecar.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/sidecar.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/sidecar.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/sidecar.py
diff --git a/sdk/python/tests/compiler/testdata/sidecar.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/sidecar.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/sidecar.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/sidecar.yaml
diff --git a/sdk/python/tests/compiler/testdata/test_data/consume_2.component.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/test_data/consume_2.component.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/test_data/consume_2.component.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/test_data/consume_2.component.yaml
diff --git a/sdk/python/tests/compiler/testdata/test_data/process_2_2.component.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/test_data/process_2_2.component.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/test_data/process_2_2.component.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/test_data/process_2_2.component.yaml
diff --git a/sdk/python/tests/compiler/testdata/test_data/produce_2.component.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/test_data/produce_2.component.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/test_data/produce_2.component.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/test_data/produce_2.component.yaml
diff --git a/sdk/python/tests/compiler/testdata/testpackage/mypipeline/__init__.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/testpackage/mypipeline/__init__.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/testpackage/mypipeline/__init__.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/testpackage/mypipeline/__init__.py
diff --git a/sdk/python/tests/compiler/testdata/testpackage/mypipeline/compose.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/testpackage/mypipeline/compose.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/testpackage/mypipeline/compose.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/testpackage/mypipeline/compose.py
diff --git a/sdk/python/tests/compiler/testdata/testpackage/mypipeline/kaniko.basic.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/testpackage/mypipeline/kaniko.basic.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/testpackage/mypipeline/kaniko.basic.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/testpackage/mypipeline/kaniko.basic.yaml
diff --git a/sdk/python/tests/compiler/testdata/testpackage/setup.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/testpackage/setup.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/testpackage/setup.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/testpackage/setup.py
diff --git a/sdk/python/tests/compiler/testdata/timeout.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/timeout.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/timeout.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/timeout.py
diff --git a/sdk/python/tests/compiler/testdata/timeout.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/timeout.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/timeout.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/timeout.yaml
diff --git a/sdk/python/tests/compiler/testdata/tolerations.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/tolerations.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/tolerations.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/tolerations.yaml
diff --git a/sdk/python/tests/compiler/testdata/two_step.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/two_step.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/two_step.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/two_step.py
diff --git a/sdk/python/tests/compiler/testdata/uri_artifacts.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/uri_artifacts.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/uri_artifacts.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/uri_artifacts.py
diff --git a/sdk/python/tests/compiler/testdata/uri_artifacts.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/uri_artifacts.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/uri_artifacts.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/uri_artifacts.yaml
diff --git a/sdk/python/tests/compiler/testdata/volume.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/volume.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volume.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volume.py
diff --git a/sdk/python/tests/compiler/testdata/volume.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/volume.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volume.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volume.yaml
diff --git a/sdk/python/tests/compiler/testdata/volume_snapshotop_rokurl.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/volume_snapshotop_rokurl.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volume_snapshotop_rokurl.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volume_snapshotop_rokurl.py
diff --git a/sdk/python/tests/compiler/testdata/volume_snapshotop_rokurl.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/volume_snapshotop_rokurl.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volume_snapshotop_rokurl.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volume_snapshotop_rokurl.yaml
diff --git a/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/volume_snapshotop_sequential.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volume_snapshotop_sequential.py
diff --git a/sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/volume_snapshotop_sequential.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volume_snapshotop_sequential.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volume_snapshotop_sequential.yaml
diff --git a/sdk/python/tests/compiler/testdata/volumeop_basic.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_basic.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volumeop_basic.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_basic.py
diff --git a/sdk/python/tests/compiler/testdata/volumeop_basic.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_basic.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volumeop_basic.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_basic.yaml
diff --git a/sdk/python/tests/compiler/testdata/volumeop_dag.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_dag.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volumeop_dag.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_dag.py
diff --git a/sdk/python/tests/compiler/testdata/volumeop_dag.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_dag.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volumeop_dag.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_dag.yaml
diff --git a/sdk/python/tests/compiler/testdata/volumeop_parallel.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_parallel.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volumeop_parallel.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_parallel.py
diff --git a/sdk/python/tests/compiler/testdata/volumeop_parallel.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_parallel.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volumeop_parallel.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_parallel.yaml
diff --git a/sdk/python/tests/compiler/testdata/volumeop_sequential.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_sequential.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volumeop_sequential.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_sequential.py
diff --git a/sdk/python/tests/compiler/testdata/volumeop_sequential.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_sequential.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/volumeop_sequential.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/volumeop_sequential.yaml
diff --git a/sdk/python/tests/compiler/testdata/withitem_basic.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/withitem_basic.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withitem_basic.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withitem_basic.py
diff --git a/sdk/python/tests/compiler/testdata/withitem_basic.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/withitem_basic.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withitem_basic.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withitem_basic.yaml
diff --git a/sdk/python/tests/compiler/testdata/withitem_nested.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/withitem_nested.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withitem_nested.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withitem_nested.py
diff --git a/sdk/python/tests/compiler/testdata/withitem_nested.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/withitem_nested.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withitem_nested.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withitem_nested.yaml
diff --git a/sdk/python/tests/compiler/testdata/withparam_global.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_global.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withparam_global.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_global.py
diff --git a/sdk/python/tests/compiler/testdata/withparam_global.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_global.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withparam_global.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_global.yaml
diff --git a/sdk/python/tests/compiler/testdata/withparam_global_dict.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_global_dict.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withparam_global_dict.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_global_dict.py
diff --git a/sdk/python/tests/compiler/testdata/withparam_global_dict.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_global_dict.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withparam_global_dict.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_global_dict.yaml
diff --git a/sdk/python/tests/compiler/testdata/withparam_output.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_output.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withparam_output.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_output.py
diff --git a/sdk/python/tests/compiler/testdata/withparam_output.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_output.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withparam_output.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_output.yaml
diff --git a/sdk/python/tests/compiler/testdata/withparam_output_dict.py b/sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_output_dict.py
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withparam_output_dict.py
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_output_dict.py
diff --git a/sdk/python/tests/compiler/testdata/withparam_output_dict.yaml b/sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_output_dict.yaml
similarity index 100%
rename from sdk/python/tests/compiler/testdata/withparam_output_dict.yaml
rename to sdk/python/kfp/deprecated_tests/compiler/testdata/withparam_output_dict.yaml
diff --git a/sdk/python/tests/dsl/__init__.py b/sdk/python/kfp/deprecated_tests/dsl/__init__.py
similarity index 100%
rename from sdk/python/tests/dsl/__init__.py
rename to sdk/python/kfp/deprecated_tests/dsl/__init__.py
diff --git a/sdk/python/tests/dsl/aws_extensions_tests.py b/sdk/python/kfp/deprecated_tests/dsl/aws_extensions_tests.py
similarity index 100%
rename from sdk/python/tests/dsl/aws_extensions_tests.py
rename to sdk/python/kfp/deprecated_tests/dsl/aws_extensions_tests.py
diff --git a/sdk/python/tests/dsl/component_bridge_tests.py b/sdk/python/kfp/deprecated_tests/dsl/component_bridge_tests.py
similarity index 100%
rename from sdk/python/tests/dsl/component_bridge_tests.py
rename to sdk/python/kfp/deprecated_tests/dsl/component_bridge_tests.py
diff --git a/sdk/python/tests/dsl/component_tests.py b/sdk/python/kfp/deprecated_tests/dsl/component_tests.py
similarity index 100%
rename from sdk/python/tests/dsl/component_tests.py
rename to sdk/python/kfp/deprecated_tests/dsl/component_tests.py
diff --git a/sdk/python/tests/dsl/extensions/__init__.py b/sdk/python/kfp/deprecated_tests/dsl/extensions/__init__.py
similarity index 100%
rename from sdk/python/tests/dsl/extensions/__init__.py
rename to sdk/python/kfp/deprecated_tests/dsl/extensions/__init__.py
diff --git a/sdk/python/tests/dsl/extensions/test_kubernetes.py b/sdk/python/kfp/deprecated_tests/dsl/extensions/test_kubernetes.py
similarity index 100%
rename from sdk/python/tests/dsl/extensions/test_kubernetes.py
rename to sdk/python/kfp/deprecated_tests/dsl/extensions/test_kubernetes.py
diff --git a/sdk/python/tests/dsl/main.py b/sdk/python/kfp/deprecated_tests/dsl/main.py
similarity index 100%
rename from sdk/python/tests/dsl/main.py
rename to sdk/python/kfp/deprecated_tests/dsl/main.py
diff --git a/sdk/python/tests/dsl/metadata_tests.py b/sdk/python/kfp/deprecated_tests/dsl/metadata_tests.py
similarity index 100%
rename from sdk/python/tests/dsl/metadata_tests.py
rename to sdk/python/kfp/deprecated_tests/dsl/metadata_tests.py
diff --git a/sdk/python/tests/dsl/ops_group_tests.py b/sdk/python/kfp/deprecated_tests/dsl/ops_group_tests.py
similarity index 100%
rename from sdk/python/tests/dsl/ops_group_tests.py
rename to sdk/python/kfp/deprecated_tests/dsl/ops_group_tests.py
diff --git a/sdk/python/tests/dsl/pipeline_param_tests.py b/sdk/python/kfp/deprecated_tests/dsl/pipeline_param_tests.py
similarity index 100%
rename from sdk/python/tests/dsl/pipeline_param_tests.py
rename to sdk/python/kfp/deprecated_tests/dsl/pipeline_param_tests.py
diff --git a/sdk/python/tests/dsl/pipeline_tests.py b/sdk/python/kfp/deprecated_tests/dsl/pipeline_tests.py
similarity index 100%
rename from sdk/python/tests/dsl/pipeline_tests.py
rename to sdk/python/kfp/deprecated_tests/dsl/pipeline_tests.py
diff --git a/sdk/python/tests/dsl/test_azure_extensions.py b/sdk/python/kfp/deprecated_tests/dsl/test_azure_extensions.py
similarity index 100%
rename from sdk/python/tests/dsl/test_azure_extensions.py
rename to sdk/python/kfp/deprecated_tests/dsl/test_azure_extensions.py
diff --git a/sdk/python/tests/dsl/type_tests.py b/sdk/python/kfp/deprecated_tests/dsl/type_tests.py
similarity index 100%
rename from sdk/python/tests/dsl/type_tests.py
rename to sdk/python/kfp/deprecated_tests/dsl/type_tests.py
diff --git a/sdk/python/tests/local_runner_test.py b/sdk/python/kfp/deprecated_tests/local_runner_test.py
similarity index 100%
rename from sdk/python/tests/local_runner_test.py
rename to sdk/python/kfp/deprecated_tests/local_runner_test.py
diff --git a/sdk/python/tests/run_tests.sh b/sdk/python/kfp/deprecated_tests/run_tests.sh
similarity index 100%
rename from sdk/python/tests/run_tests.sh
rename to sdk/python/kfp/deprecated_tests/run_tests.sh
diff --git a/sdk/python/tests/test_kfp.py b/sdk/python/kfp/deprecated_tests/test_kfp.py
similarity index 100%
rename from sdk/python/tests/test_kfp.py
rename to sdk/python/kfp/deprecated_tests/test_kfp.py