diff --git a/lib/sagemaker-container-support b/lib/sagemaker-container-support
index 3b5557be..284ddd72 160000
--- a/lib/sagemaker-container-support
+++ b/lib/sagemaker-container-support
@@ -1 +1 @@
-Subproject commit 3b5557be47d5b30cf4250e6057f7cba63015fac5
+Subproject commit 284ddd72da84feff3f39c9a34272dac91a9a1a2a
diff --git a/test/integration/__init__.py b/test/integration/__init__.py
new file mode 100644
index 00000000..e1e6f457
--- /dev/null
+++ b/test/integration/__init__.py
@@ -0,0 +1,12 @@
+# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
diff --git a/test/integration/local/__init__.py b/test/integration/local/__init__.py
new file mode 100644
index 00000000..e1e6f457
--- /dev/null
+++ b/test/integration/local/__init__.py
@@ -0,0 +1,12 @@
+# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
diff --git a/test/integ/test_distributed_training.py b/test/integration/local/test_distributed_training.py
similarity index 99%
rename from test/integ/test_distributed_training.py
rename to test/integration/local/test_distributed_training.py
index 71e13544..a4b95ba8 100644
--- a/test/integ/test_distributed_training.py
+++ b/test/integration/local/test_distributed_training.py
@@ -15,7 +15,7 @@
 import torch
 from test.utils import local_mode
 
-resources_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'resources'))
+resources_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'resources'))
 mnist_path = os.path.join(resources_path, 'mnist')
 mnist_script = os.path.join(mnist_path, 'mnist.py')
 data_dir = os.path.join(mnist_path, 'data')
diff --git a/test/integ/test_serving.py b/test/integration/local/test_serving.py
similarity index 99%
rename from test/integ/test_serving.py
rename to test/integration/local/test_serving.py
index 1e74827b..540f502e 100644
--- a/test/integ/test_serving.py
+++ b/test/integration/local/test_serving.py
@@ -27,7 +27,7 @@
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 
-mnist_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'resources', 'mnist')
+mnist_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'resources', 'mnist')
 mnist_script = os.path.join(mnist_path, 'mnist.py')
 mnist_1d_script = os.path.join(mnist_path, 'mnist_1d.py')
 model_cpu_dir = os.path.join(mnist_path, 'model_cpu')
diff --git a/test/integ/test_single_machine_training.py b/test/integration/local/test_single_machine_training.py
similarity index 100%
rename from test/integ/test_single_machine_training.py
rename to test/integration/local/test_single_machine_training.py