diff --git a/.circleci/config.yml b/.circleci/config.yml
index a8068e4d..094a747f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ step_library:
     command: |
       git submodule sync
       git submodule update --init || (rm -fr .git/config .git/modules && git submodule deinit -f . && git submodule update --init)
-      make itests-circleci
+      make itests
 
 - &step_build_artifact
   run:
diff --git a/.gitignore b/.gitignore
index 2d481eef..333bf061 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ _vendor-*/
 target/
 
 # exclude itest outputs
-itests/tests/*/output/*
+itests/tests/*/*/output/*
 itests/test_output/*
+itests/tests/*/*/perf_output/*
 itests/perf_output/*
diff --git a/Makefile b/Makefile
index 43c3d6e5..7a7aeb42 100644
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,9 @@ test: vendor generate vet
 	@echo "Executing tests ..."
 	go test -race -v ${GO_TEST_EXTRAS} ./...
 
-itests-circleci:
-	@echo "Running integration tests"
-	TEST_NAME=test_basic docker-compose -f itests/docker-compose.yml build
-	cd ./itests && ./circleci_split_itests.sh
-
 itests:
 	@echo "Running integration tests"
-	TEST_NAME=test_basic docker-compose -f itests/docker-compose.yml build
-	cd ./itests && ./integration_tests.bats -r tests
+	cd ./itests && ./itests_runner.sh
 
 clean:
 	@echo "Removing vendor deps"
diff --git a/itests/circleci_split_itests.sh b/itests/circleci_split_itests.sh
deleted file mode 100755
index 7d2c8939..00000000
--- a/itests/circleci_split_itests.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 Nextdoor.com, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License 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.
-
-TESTFILES=$(cd tests && circleci tests glob "*" | circleci tests split --split-by=timings)
-echo "TESTFILES=$TESTFILES"
-for TEST in $TESTFILES
-do
-   echo "running test $TEST"
-   ./integration_tests.bats -r tests -f "$TEST"
-done
diff --git a/itests/common.bash b/itests/common.bash
index 0de9b0e3..bc4754af 100644
--- a/itests/common.bash
+++ b/itests/common.bash
@@ -55,7 +55,7 @@ _startup() {
   sleep 5
 
   _check_container postgres
-  _check_container kinesis
+  _check_container localstack
   _check_container bifrost
 
   log "Containers are running!"
@@ -221,7 +221,7 @@ _profile() {
 
 _wait() {
   log "Waiting for test to finish"
-  grep -q 'Records read' <(docker logs --follow kinesis-poller 2>&1)
+  grep -q 'Records read' <(docker logs --follow data-poller 2>&1)
   pkill -f "docker logs.*" || true
 }
 
diff --git a/itests/containers/kinesis-poller/Dockerfile b/itests/containers/data-poller/Dockerfile
similarity index 83%
rename from itests/containers/kinesis-poller/Dockerfile
rename to itests/containers/data-poller/Dockerfile
index 32e5393f..71d8b7ce 100644
--- a/itests/containers/kinesis-poller/Dockerfile
+++ b/itests/containers/data-poller/Dockerfile
@@ -7,4 +7,4 @@ RUN \
 
 ADD app /app
 VOLUME /output
-CMD ["python", "/app/poller.py"]
\ No newline at end of file
+CMD ["sh", "/app/entrypoint.sh"]
diff --git a/itests/containers/data-poller/app/entrypoint.sh b/itests/containers/data-poller/app/entrypoint.sh
new file mode 100644
index 00000000..e61263a7
--- /dev/null
+++ b/itests/containers/data-poller/app/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Please set this in your docker run config to specify which poller is used.
+TRANSPORT_SINK=${TRANSPORT_SINK:-}
+
+python /app/poller-$TRANSPORT_SINK.py
diff --git a/itests/containers/kinesis-poller/app/poller.py b/itests/containers/data-poller/app/poller-kinesis.py
similarity index 97%
rename from itests/containers/kinesis-poller/app/poller.py
rename to itests/containers/data-poller/app/poller-kinesis.py
index d6b45fa0..757d0592 100644
--- a/itests/containers/kinesis-poller/app/poller.py
+++ b/itests/containers/data-poller/app/poller-kinesis.py
@@ -15,7 +15,7 @@
 # Variables
 OUT_FILE = os.getenv('OUT_FILE', '/output/test')
 STREAM_NAME = os.getenv('STREAM_NAME', 'itests')
-ENDPOINT_URL = os.getenv('ENDPOINT_URL', 'http://kinesis:4568')
+ENDPOINT_URL = os.getenv('ENDPOINT_URL', 'http://localstack:4568')
 WAIT_TIME = int(os.getenv('WAIT_TIME', '90'))
 EXPECTED_COUNT = int(os.getenv('EXPECTED_COUNT', '1'))
 AWS_REGION = os.getenv('AWS_REGION', 'us-east-1')
diff --git a/itests/containers/defaults.env b/itests/containers/defaults.env
index e13636bb..5f25eb06 100644
--- a/itests/containers/defaults.env
+++ b/itests/containers/defaults.env
@@ -9,4 +9,3 @@ BIFROST_KINESIS_STREAM=itests
 AWS_ACCESS_KEY_ID=DUMMYACCESSKEYID
 AWS_SECRET_ACCESS_KEY=DUMMYSECRETACCESSKEY
 AWS_REGION=us-east-1
-ENDPOINT=http://kinesis:4568
diff --git a/itests/contexts/kinesis.env b/itests/contexts/kinesis.env
new file mode 100644
index 00000000..81273ab1
--- /dev/null
+++ b/itests/contexts/kinesis.env
@@ -0,0 +1,3 @@
+TRANSPORT_SINK=kinesis
+LOCALSTACK_PORT=4568
+ENDPOINT=http://localstack:4568
diff --git a/itests/docker-compose.yml b/itests/docker-compose.yml
index ea689613..c554e937 100644
--- a/itests/docker-compose.yml
+++ b/itests/docker-compose.yml
@@ -10,16 +10,16 @@ services:
     networks:
       - net
 
-  kinesis:
-    container_name: kinesis
+  localstack:
+    container_name: localstack
     image: localstack/localstack:0.8.7
     env_file:
-    - "./containers/defaults.env"
-    - "./tests/${TEST_NAME}/envfile.env"
+      - "./containers/defaults.env"
+      - "./tests/${TEST_NAME}/envfile.env"
     environment:
-      - SERVICES=kinesis
+      - SERVICES=${TRANSPORT_SINK}
     ports:
-     - 4568:4568
+      - ${LOCALSTACK_PORT}:${LOCALSTACK_PORT}
     restart: always
     networks:
       - net
@@ -28,29 +28,31 @@ services:
     container_name: bifrost
     image: pg-bifrost:latest
     env_file:
-    - "./containers/defaults.env"
-    - "./tests/${TEST_NAME}/envfile.env"
+      - "./containers/defaults.env"
+      - "./tests/${TEST_NAME}/envfile.env"
+      - "./contexts/${TRANSPORT_SINK}.env"
     volumes:
       - "./tests/${TEST_NAME}/perf_output:/perf"
     networks:
       net:
         aliases:
-          - kinesis
+          - localstack
           - postgres
-    command: /pg-bifrost replicate kinesis
+    command: /pg-bifrost replicate ${TRANSPORT_SINK}
 
-  kinesis-poller:
-    container_name: kinesis-poller
-    build: containers/kinesis-poller
+  data-poller:
+    container_name: data-poller
+    build: containers/data-poller
     env_file:
-    - "./containers/defaults.env"
-    - "./tests/${TEST_NAME}/envfile.env"
+      - "./containers/defaults.env"
+      - "./tests/${TEST_NAME}/envfile.env"
+      - "./contexts/${TRANSPORT_SINK}.env"
     volumes:
-    - "./tests/${TEST_NAME}/output:/output"
+      - "./tests/${TEST_NAME}/output:/output"
     networks:
       net:
         aliases:
-          - kinesis
+          - localstack
 
 networks:
-  net:
\ No newline at end of file
+  net:
diff --git a/itests/itests_runner.sh b/itests/itests_runner.sh
new file mode 100755
index 00000000..e680e92d
--- /dev/null
+++ b/itests/itests_runner.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Copyright 2019 Nextdoor.com, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License 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.
+
+get_testfiles() {
+    _transport_sink=$1
+
+    if [ "$CI" == "true" ]; then
+        _base_testfiles=$(cd tests/base && circleci tests glob "*" | circleci tests split --split-by=timings | sed -e 's/^/base\//')
+        _specific_testfiles=$(cd tests/${_transport_sink} && circleci tests glob "*" | circleci tests split --split-by=timings | sed -e "s/^/${_transport_sink}\//")
+    else
+        _base_testfiles=$(cd tests/base && ls -d */ | sed 's#/##' | sed -e 's/^/base\//')
+        _specific_testfiles=$(cd tests/${_transport_sink} && ls -d */ | sed 's#/##' | sed -e "s/^/${_transport_sink}\//")
+    fi
+
+    echo "${_base_testfiles} ${_specific_testfiles}"
+}
+
+# Kinesis
+set -a ; . contexts/kinesis.env ; set +a
+
+TEST_NAME=base/test_basic docker-compose -f docker-compose.yml build
+TESTFILES=$(get_testfiles $TRANSPORT_SINK)
+
+echo "TESTFILES:"
+echo $TESTFILES | tr ' ' '\n'
+
+for TEST in $TESTFILES
+do
+   echo "running test $TEST"
+   ./integration_tests.bats -r tests -f "$TEST"
+done
+
+unset $(cat contexts/kinesis.env | awk -F= '{print $1}' | xargs)
diff --git a/itests/tests/test_basic/envfile.env b/itests/tests/base/test_basic/envfile.env
similarity index 100%
rename from itests/tests/test_basic/envfile.env
rename to itests/tests/base/test_basic/envfile.env
diff --git a/itests/tests/test_basic/golden/test.0 b/itests/tests/base/test_basic/golden/test.0
similarity index 100%
rename from itests/tests/test_basic/golden/test.0
rename to itests/tests/base/test_basic/golden/test.0
diff --git a/itests/tests/test_basic/input/001.sql b/itests/tests/base/test_basic/input/001.sql
similarity index 100%
rename from itests/tests/test_basic/input/001.sql
rename to itests/tests/base/test_basic/input/001.sql
diff --git a/itests/tests/base/test_basic/test.bats b/itests/tests/base/test_basic/test.bats
new file mode 100644
index 00000000..edc47b27
--- /dev/null
+++ b/itests/tests/base/test_basic/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_basic" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_blacklist/envfile.env b/itests/tests/base/test_blacklist/envfile.env
similarity index 100%
rename from itests/tests/test_blacklist/envfile.env
rename to itests/tests/base/test_blacklist/envfile.env
diff --git a/itests/tests/test_blacklist/golden/test.0 b/itests/tests/base/test_blacklist/golden/test.0
similarity index 100%
rename from itests/tests/test_blacklist/golden/test.0
rename to itests/tests/base/test_blacklist/golden/test.0
diff --git a/itests/tests/test_blacklist/input/001.sql b/itests/tests/base/test_blacklist/input/001.sql
similarity index 100%
rename from itests/tests/test_blacklist/input/001.sql
rename to itests/tests/base/test_blacklist/input/001.sql
diff --git a/itests/tests/base/test_blacklist/test.bats b/itests/tests/base/test_blacklist/test.bats
new file mode 100644
index 00000000..cf9ba294
--- /dev/null
+++ b/itests/tests/base/test_blacklist/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_blacklist" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_large_sleep/envfile.env b/itests/tests/base/test_large_sleep/envfile.env
similarity index 100%
rename from itests/tests/test_large_sleep/envfile.env
rename to itests/tests/base/test_large_sleep/envfile.env
diff --git a/itests/tests/test_large_sleep/golden/test.0 b/itests/tests/base/test_large_sleep/golden/test.0
similarity index 100%
rename from itests/tests/test_large_sleep/golden/test.0
rename to itests/tests/base/test_large_sleep/golden/test.0
diff --git a/itests/tests/test_large_sleep/input/001.sql b/itests/tests/base/test_large_sleep/input/001.sql
similarity index 100%
rename from itests/tests/test_large_sleep/input/001.sql
rename to itests/tests/base/test_large_sleep/input/001.sql
diff --git a/itests/tests/test_large_sleep/perf_base/cpu.pprof b/itests/tests/base/test_large_sleep/perf_base/cpu.pprof
similarity index 100%
rename from itests/tests/test_large_sleep/perf_base/cpu.pprof
rename to itests/tests/base/test_large_sleep/perf_base/cpu.pprof
diff --git a/itests/tests/test_large_sleep/perf_base/mem.pprof b/itests/tests/base/test_large_sleep/perf_base/mem.pprof
similarity index 100%
rename from itests/tests/test_large_sleep/perf_base/mem.pprof
rename to itests/tests/base/test_large_sleep/perf_base/mem.pprof
diff --git a/itests/tests/base/test_large_sleep/test.bats b/itests/tests/base/test_large_sleep/test.bats
new file mode 100644
index 00000000..6529102b
--- /dev/null
+++ b/itests/tests/base/test_large_sleep/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_large_sleep" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_large_txn/envfile.env b/itests/tests/base/test_large_txn/envfile.env
similarity index 100%
rename from itests/tests/test_large_txn/envfile.env
rename to itests/tests/base/test_large_txn/envfile.env
diff --git a/itests/tests/test_large_txn/golden/test.0 b/itests/tests/base/test_large_txn/golden/test.0
similarity index 100%
rename from itests/tests/test_large_txn/golden/test.0
rename to itests/tests/base/test_large_txn/golden/test.0
diff --git a/itests/tests/test_large_txn/input/001.sql b/itests/tests/base/test_large_txn/input/001.sql
similarity index 100%
rename from itests/tests/test_large_txn/input/001.sql
rename to itests/tests/base/test_large_txn/input/001.sql
diff --git a/itests/tests/test_large_txn/perf_base/cpu.pprof b/itests/tests/base/test_large_txn/perf_base/cpu.pprof
similarity index 100%
rename from itests/tests/test_large_txn/perf_base/cpu.pprof
rename to itests/tests/base/test_large_txn/perf_base/cpu.pprof
diff --git a/itests/tests/test_large_txn/perf_base/mem.pprof b/itests/tests/base/test_large_txn/perf_base/mem.pprof
similarity index 100%
rename from itests/tests/test_large_txn/perf_base/mem.pprof
rename to itests/tests/base/test_large_txn/perf_base/mem.pprof
diff --git a/itests/tests/base/test_large_txn/test.bats b/itests/tests/base/test_large_txn/test.bats
new file mode 100644
index 00000000..19c5294a
--- /dev/null
+++ b/itests/tests/base/test_large_txn/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_large_txn" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_small_queue/envfile.env b/itests/tests/base/test_small_queue/envfile.env
similarity index 100%
rename from itests/tests/test_small_queue/envfile.env
rename to itests/tests/base/test_small_queue/envfile.env
diff --git a/itests/tests/test_small_queue/golden/test.0 b/itests/tests/base/test_small_queue/golden/test.0
similarity index 100%
rename from itests/tests/test_small_queue/golden/test.0
rename to itests/tests/base/test_small_queue/golden/test.0
diff --git a/itests/tests/test_small_queue/input/001.sql b/itests/tests/base/test_small_queue/input/001.sql
similarity index 100%
rename from itests/tests/test_small_queue/input/001.sql
rename to itests/tests/base/test_small_queue/input/001.sql
diff --git a/itests/tests/base/test_small_queue/test.bats b/itests/tests/base/test_small_queue/test.bats
new file mode 100644
index 00000000..26996769
--- /dev/null
+++ b/itests/tests/base/test_small_queue/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_small_queue" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_staggered/envfile.env b/itests/tests/base/test_staggered/envfile.env
similarity index 100%
rename from itests/tests/test_staggered/envfile.env
rename to itests/tests/base/test_staggered/envfile.env
diff --git a/itests/tests/test_staggered/golden/test.0 b/itests/tests/base/test_staggered/golden/test.0
similarity index 100%
rename from itests/tests/test_staggered/golden/test.0
rename to itests/tests/base/test_staggered/golden/test.0
diff --git a/itests/tests/test_staggered/input/001.sql b/itests/tests/base/test_staggered/input/001.sql
similarity index 100%
rename from itests/tests/test_staggered/input/001.sql
rename to itests/tests/base/test_staggered/input/001.sql
diff --git a/itests/tests/test_staggered/input/002.sql b/itests/tests/base/test_staggered/input/002.sql
similarity index 100%
rename from itests/tests/test_staggered/input/002.sql
rename to itests/tests/base/test_staggered/input/002.sql
diff --git a/itests/tests/base/test_staggered/test.bats b/itests/tests/base/test_staggered/test.bats
new file mode 100644
index 00000000..0e65cf72
--- /dev/null
+++ b/itests/tests/base/test_staggered/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_staggered" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_timeout/envfile.env b/itests/tests/base/test_timeout/envfile.env
similarity index 100%
rename from itests/tests/test_timeout/envfile.env
rename to itests/tests/base/test_timeout/envfile.env
diff --git a/itests/tests/test_timeout/golden/test.0 b/itests/tests/base/test_timeout/golden/test.0
similarity index 100%
rename from itests/tests/test_timeout/golden/test.0
rename to itests/tests/base/test_timeout/golden/test.0
diff --git a/itests/tests/test_timeout/input/001.sql b/itests/tests/base/test_timeout/input/001.sql
similarity index 100%
rename from itests/tests/test_timeout/input/001.sql
rename to itests/tests/base/test_timeout/input/001.sql
diff --git a/itests/tests/base/test_timeout/test.bats b/itests/tests/base/test_timeout/test.bats
new file mode 100644
index 00000000..e2fd8928
--- /dev/null
+++ b/itests/tests/base/test_timeout/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_timeout" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_txn_shard_partition/envfile.env b/itests/tests/base/test_txn_shard_partition/envfile.env
similarity index 100%
rename from itests/tests/test_txn_shard_partition/envfile.env
rename to itests/tests/base/test_txn_shard_partition/envfile.env
diff --git a/itests/tests/test_txn_shard_partition/golden/test.0 b/itests/tests/base/test_txn_shard_partition/golden/test.0
similarity index 100%
rename from itests/tests/test_txn_shard_partition/golden/test.0
rename to itests/tests/base/test_txn_shard_partition/golden/test.0
diff --git a/itests/tests/test_txn_shard_partition/golden/test.1 b/itests/tests/base/test_txn_shard_partition/golden/test.1
similarity index 100%
rename from itests/tests/test_txn_shard_partition/golden/test.1
rename to itests/tests/base/test_txn_shard_partition/golden/test.1
diff --git a/itests/tests/test_txn_shard_partition/input/001.sql b/itests/tests/base/test_txn_shard_partition/input/001.sql
similarity index 100%
rename from itests/tests/test_txn_shard_partition/input/001.sql
rename to itests/tests/base/test_txn_shard_partition/input/001.sql
diff --git a/itests/tests/base/test_txn_shard_partition/test.bats b/itests/tests/base/test_txn_shard_partition/test.bats
new file mode 100644
index 00000000..765e7b2a
--- /dev/null
+++ b/itests/tests/base/test_txn_shard_partition/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_txn_shard_partition" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_whitelist/envfile.env b/itests/tests/base/test_whitelist/envfile.env
similarity index 100%
rename from itests/tests/test_whitelist/envfile.env
rename to itests/tests/base/test_whitelist/envfile.env
diff --git a/itests/tests/test_whitelist/golden/test.0 b/itests/tests/base/test_whitelist/golden/test.0
similarity index 100%
rename from itests/tests/test_whitelist/golden/test.0
rename to itests/tests/base/test_whitelist/golden/test.0
diff --git a/itests/tests/test_whitelist/input/001.sql b/itests/tests/base/test_whitelist/input/001.sql
similarity index 100%
rename from itests/tests/test_whitelist/input/001.sql
rename to itests/tests/base/test_whitelist/input/001.sql
diff --git a/itests/tests/base/test_whitelist/test.bats b/itests/tests/base/test_whitelist/test.bats
new file mode 100644
index 00000000..2e7d43ad
--- /dev/null
+++ b/itests/tests/base/test_whitelist/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "base/test_whitelist" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_high_kinesis_errors/envfile.env b/itests/tests/kinesis/test_high_kinesis_errors/envfile.env
similarity index 100%
rename from itests/tests/test_high_kinesis_errors/envfile.env
rename to itests/tests/kinesis/test_high_kinesis_errors/envfile.env
diff --git a/itests/tests/test_high_kinesis_errors/golden/test.0 b/itests/tests/kinesis/test_high_kinesis_errors/golden/test.0
similarity index 100%
rename from itests/tests/test_high_kinesis_errors/golden/test.0
rename to itests/tests/kinesis/test_high_kinesis_errors/golden/test.0
diff --git a/itests/tests/test_high_kinesis_errors/input/001.sql b/itests/tests/kinesis/test_high_kinesis_errors/input/001.sql
similarity index 100%
rename from itests/tests/test_high_kinesis_errors/input/001.sql
rename to itests/tests/kinesis/test_high_kinesis_errors/input/001.sql
diff --git a/itests/tests/kinesis/test_high_kinesis_errors/test.bats b/itests/tests/kinesis/test_high_kinesis_errors/test.bats
new file mode 100644
index 00000000..2be16c4d
--- /dev/null
+++ b/itests/tests/kinesis/test_high_kinesis_errors/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "kinesis/test_high_kinesis_errors" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_multi_worker_high_kinesis_errors/envfile.env b/itests/tests/kinesis/test_multi_worker_high_kinesis_errors/envfile.env
similarity index 100%
rename from itests/tests/test_multi_worker_high_kinesis_errors/envfile.env
rename to itests/tests/kinesis/test_multi_worker_high_kinesis_errors/envfile.env
diff --git a/itests/tests/test_multi_worker_high_kinesis_errors/golden/test.0 b/itests/tests/kinesis/test_multi_worker_high_kinesis_errors/golden/test.0
similarity index 100%
rename from itests/tests/test_multi_worker_high_kinesis_errors/golden/test.0
rename to itests/tests/kinesis/test_multi_worker_high_kinesis_errors/golden/test.0
diff --git a/itests/tests/test_multi_worker_high_kinesis_errors/input/001.sql b/itests/tests/kinesis/test_multi_worker_high_kinesis_errors/input/001.sql
similarity index 100%
rename from itests/tests/test_multi_worker_high_kinesis_errors/input/001.sql
rename to itests/tests/kinesis/test_multi_worker_high_kinesis_errors/input/001.sql
diff --git a/itests/tests/test_multi_worker_high_kinesis_errors/perf_base/cpu.pprof b/itests/tests/kinesis/test_multi_worker_high_kinesis_errors/perf_base/cpu.pprof
similarity index 100%
rename from itests/tests/test_multi_worker_high_kinesis_errors/perf_base/cpu.pprof
rename to itests/tests/kinesis/test_multi_worker_high_kinesis_errors/perf_base/cpu.pprof
diff --git a/itests/tests/test_multi_worker_high_kinesis_errors/perf_base/mem.pprof b/itests/tests/kinesis/test_multi_worker_high_kinesis_errors/perf_base/mem.pprof
similarity index 100%
rename from itests/tests/test_multi_worker_high_kinesis_errors/perf_base/mem.pprof
rename to itests/tests/kinesis/test_multi_worker_high_kinesis_errors/perf_base/mem.pprof
diff --git a/itests/tests/kinesis/test_multi_worker_high_kinesis_errors/test.bats b/itests/tests/kinesis/test_multi_worker_high_kinesis_errors/test.bats
new file mode 100644
index 00000000..d140f932
--- /dev/null
+++ b/itests/tests/kinesis/test_multi_worker_high_kinesis_errors/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "kinesis/test_multi_worker_high_kinesis_errors" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_multi_worker_no_kinesis_errors/envfile.env b/itests/tests/kinesis/test_multi_worker_no_kinesis_errors/envfile.env
similarity index 100%
rename from itests/tests/test_multi_worker_no_kinesis_errors/envfile.env
rename to itests/tests/kinesis/test_multi_worker_no_kinesis_errors/envfile.env
diff --git a/itests/tests/test_multi_worker_no_kinesis_errors/golden/test.0 b/itests/tests/kinesis/test_multi_worker_no_kinesis_errors/golden/test.0
similarity index 100%
rename from itests/tests/test_multi_worker_no_kinesis_errors/golden/test.0
rename to itests/tests/kinesis/test_multi_worker_no_kinesis_errors/golden/test.0
diff --git a/itests/tests/test_multi_worker_no_kinesis_errors/input/001.sql b/itests/tests/kinesis/test_multi_worker_no_kinesis_errors/input/001.sql
similarity index 100%
rename from itests/tests/test_multi_worker_no_kinesis_errors/input/001.sql
rename to itests/tests/kinesis/test_multi_worker_no_kinesis_errors/input/001.sql
diff --git a/itests/tests/test_multi_worker_no_kinesis_errors/perf_base/cpu.pprof b/itests/tests/kinesis/test_multi_worker_no_kinesis_errors/perf_base/cpu.pprof
similarity index 100%
rename from itests/tests/test_multi_worker_no_kinesis_errors/perf_base/cpu.pprof
rename to itests/tests/kinesis/test_multi_worker_no_kinesis_errors/perf_base/cpu.pprof
diff --git a/itests/tests/test_multi_worker_no_kinesis_errors/perf_base/mem.pprof b/itests/tests/kinesis/test_multi_worker_no_kinesis_errors/perf_base/mem.pprof
similarity index 100%
rename from itests/tests/test_multi_worker_no_kinesis_errors/perf_base/mem.pprof
rename to itests/tests/kinesis/test_multi_worker_no_kinesis_errors/perf_base/mem.pprof
diff --git a/itests/tests/kinesis/test_multi_worker_no_kinesis_errors/test.bats b/itests/tests/kinesis/test_multi_worker_no_kinesis_errors/test.bats
new file mode 100644
index 00000000..6a6a6906
--- /dev/null
+++ b/itests/tests/kinesis/test_multi_worker_no_kinesis_errors/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "kinesis/test_multi_worker_no_kinesis_errors" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_strict_order_shared/envfile.env b/itests/tests/kinesis/test_strict_order_shared/envfile.env
similarity index 100%
rename from itests/tests/test_strict_order_shared/envfile.env
rename to itests/tests/kinesis/test_strict_order_shared/envfile.env
diff --git a/itests/tests/test_strict_order_shared/golden/test.0 b/itests/tests/kinesis/test_strict_order_shared/golden/test.0
similarity index 100%
rename from itests/tests/test_strict_order_shared/golden/test.0
rename to itests/tests/kinesis/test_strict_order_shared/golden/test.0
diff --git a/itests/tests/test_strict_order_shared/golden/test.1 b/itests/tests/kinesis/test_strict_order_shared/golden/test.1
similarity index 100%
rename from itests/tests/test_strict_order_shared/golden/test.1
rename to itests/tests/kinesis/test_strict_order_shared/golden/test.1
diff --git a/itests/tests/test_strict_order_shared/input/001.sql b/itests/tests/kinesis/test_strict_order_shared/input/001.sql
similarity index 100%
rename from itests/tests/test_strict_order_shared/input/001.sql
rename to itests/tests/kinesis/test_strict_order_shared/input/001.sql
diff --git a/itests/tests/test_strict_order_shared/perf_base/cpu.pprof b/itests/tests/kinesis/test_strict_order_shared/perf_base/cpu.pprof
similarity index 100%
rename from itests/tests/test_strict_order_shared/perf_base/cpu.pprof
rename to itests/tests/kinesis/test_strict_order_shared/perf_base/cpu.pprof
diff --git a/itests/tests/test_strict_order_shared/perf_base/mem.pprof b/itests/tests/kinesis/test_strict_order_shared/perf_base/mem.pprof
similarity index 100%
rename from itests/tests/test_strict_order_shared/perf_base/mem.pprof
rename to itests/tests/kinesis/test_strict_order_shared/perf_base/mem.pprof
diff --git a/itests/tests/kinesis/test_strict_order_shared/test.bats b/itests/tests/kinesis/test_strict_order_shared/test.bats
new file mode 100644
index 00000000..2c252da2
--- /dev/null
+++ b/itests/tests/kinesis/test_strict_order_shared/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "kinesis/test_strict_order_shared" {
+  SORT=false do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_table_partitioning/envfile.env b/itests/tests/kinesis/test_table_partitioning/envfile.env
similarity index 100%
rename from itests/tests/test_table_partitioning/envfile.env
rename to itests/tests/kinesis/test_table_partitioning/envfile.env
diff --git a/itests/tests/test_table_partitioning/golden/test.0 b/itests/tests/kinesis/test_table_partitioning/golden/test.0
similarity index 100%
rename from itests/tests/test_table_partitioning/golden/test.0
rename to itests/tests/kinesis/test_table_partitioning/golden/test.0
diff --git a/itests/tests/test_table_partitioning/golden/test.1 b/itests/tests/kinesis/test_table_partitioning/golden/test.1
similarity index 100%
rename from itests/tests/test_table_partitioning/golden/test.1
rename to itests/tests/kinesis/test_table_partitioning/golden/test.1
diff --git a/itests/tests/test_table_partitioning/input/001.sql b/itests/tests/kinesis/test_table_partitioning/input/001.sql
similarity index 100%
rename from itests/tests/test_table_partitioning/input/001.sql
rename to itests/tests/kinesis/test_table_partitioning/input/001.sql
diff --git a/itests/tests/kinesis/test_table_partitioning/test.bats b/itests/tests/kinesis/test_table_partitioning/test.bats
new file mode 100644
index 00000000..70b1ed85
--- /dev/null
+++ b/itests/tests/kinesis/test_table_partitioning/test.bats
@@ -0,0 +1,5 @@
+load ../../../common
+
+@test "kinesis/test_table_partitioning" {
+  do_test
+}
\ No newline at end of file
diff --git a/itests/tests/test_basic/test.bats b/itests/tests/test_basic/test.bats
deleted file mode 100644
index 3497daa5..00000000
--- a/itests/tests/test_basic/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_basic" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_blacklist/test.bats b/itests/tests/test_blacklist/test.bats
deleted file mode 100644
index b5c8fc43..00000000
--- a/itests/tests/test_blacklist/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_blacklist" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_high_kinesis_errors/test.bats b/itests/tests/test_high_kinesis_errors/test.bats
deleted file mode 100644
index 9bc66edc..00000000
--- a/itests/tests/test_high_kinesis_errors/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_high_kinesis_errors" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_large_sleep/test.bats b/itests/tests/test_large_sleep/test.bats
deleted file mode 100644
index affccf53..00000000
--- a/itests/tests/test_large_sleep/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_large_sleep" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_large_txn/test.bats b/itests/tests/test_large_txn/test.bats
deleted file mode 100644
index 0ad73d8e..00000000
--- a/itests/tests/test_large_txn/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_large_txn" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_multi_worker_high_kinesis_errors/test.bats b/itests/tests/test_multi_worker_high_kinesis_errors/test.bats
deleted file mode 100644
index 44372b73..00000000
--- a/itests/tests/test_multi_worker_high_kinesis_errors/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_multi_worker_high_kinesis_errors" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_multi_worker_no_kinesis_errors/test.bats b/itests/tests/test_multi_worker_no_kinesis_errors/test.bats
deleted file mode 100644
index 45b63059..00000000
--- a/itests/tests/test_multi_worker_no_kinesis_errors/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_multi_worker_no_kinesis_errors" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_small_queue/test.bats b/itests/tests/test_small_queue/test.bats
deleted file mode 100644
index 70f09b48..00000000
--- a/itests/tests/test_small_queue/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_small_queue" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_staggered/test.bats b/itests/tests/test_staggered/test.bats
deleted file mode 100644
index c3860f14..00000000
--- a/itests/tests/test_staggered/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_staggered" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_strict_order_shared/test.bats b/itests/tests/test_strict_order_shared/test.bats
deleted file mode 100644
index 1eb23a9f..00000000
--- a/itests/tests/test_strict_order_shared/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_strict_order_shared" {
-  SORT=false do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_table_partitioning/test.bats b/itests/tests/test_table_partitioning/test.bats
deleted file mode 100644
index 7477c688..00000000
--- a/itests/tests/test_table_partitioning/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_table_partitioning" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_timeout/test.bats b/itests/tests/test_timeout/test.bats
deleted file mode 100644
index d0b33ffe..00000000
--- a/itests/tests/test_timeout/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_timeout" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_txn_shard_partition/test.bats b/itests/tests/test_txn_shard_partition/test.bats
deleted file mode 100644
index 8e8d28a0..00000000
--- a/itests/tests/test_txn_shard_partition/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_txn_shard_partition" {
-  do_test
-}
\ No newline at end of file
diff --git a/itests/tests/test_whitelist/test.bats b/itests/tests/test_whitelist/test.bats
deleted file mode 100644
index 06f519a6..00000000
--- a/itests/tests/test_whitelist/test.bats
+++ /dev/null
@@ -1,5 +0,0 @@
-load ../../common
-
-@test "test_whitelist" {
-  do_test
-}
\ No newline at end of file