diff --git a/services/terraform/dynamodb-test.tf b/services/terraform/dynamodb-test.tf
--- a/services/terraform/dynamodb-test.tf
+++ b/services/terraform/dynamodb-test.tf
@@ -86,75 +86,6 @@
   }
 }
 
-resource "aws_dynamodb_table" "tunnelbroker-device-sessions-test" {
-  name           = "tunnelbroker-device-sessions-test"
-  hash_key       = "SessionID"
-  write_capacity = 10
-  read_capacity  = 10
-
-  attribute {
-    name = "SessionID"
-    type = "S"
-  }
-
-  ttl {
-    attribute_name = "Expire"
-    enabled        = true
-  }
-}
-
-resource "aws_dynamodb_table" "tunnelbroker-verification-messages-test" {
-  name           = "tunnelbroker-verification-messages-test"
-  hash_key       = "DeviceID"
-  write_capacity = 10
-  read_capacity  = 10
-
-  attribute {
-    name = "DeviceID"
-    type = "S"
-  }
-
-  ttl {
-    attribute_name = "Expire"
-    enabled        = true
-  }
-}
-
-resource "aws_dynamodb_table" "tunnelbroker-public-keys-test" {
-  name           = "tunnelbroker-public-keys-test"
-  hash_key       = "DeviceID"
-  write_capacity = 10
-  read_capacity  = 10
-
-  attribute {
-    name = "DeviceID"
-    type = "S"
-  }
-}
-
-resource "aws_dynamodb_table" "tunnelbroker-messages-test" {
-  name           = "tunnelbroker-messages-test"
-  hash_key       = "ToDeviceID"
-  range_key      = "MessageID"
-  write_capacity = 10
-  read_capacity  = 10
-
-  attribute {
-    name = "MessageID"
-    type = "S"
-  }
-
-  attribute {
-    name = "ToDeviceID"
-    type = "S"
-  }
-
-  ttl {
-    attribute_name = "Expire"
-    enabled        = true
-  }
-}
-
 resource "aws_dynamodb_table" "feature-flags-test" {
   name         = "feature-flags-test"
   hash_key     = "platform"
diff --git a/services/terraform/dynamodb.tf b/services/terraform/dynamodb.tf
--- a/services/terraform/dynamodb.tf
+++ b/services/terraform/dynamodb.tf
@@ -86,75 +86,6 @@
   }
 }
 
-resource "aws_dynamodb_table" "tunnelbroker-device-sessions" {
-  name           = "tunnelbroker-device-sessions"
-  hash_key       = "SessionID"
-  write_capacity = 10
-  read_capacity  = 10
-
-  attribute {
-    name = "SessionID"
-    type = "S"
-  }
-
-  ttl {
-    attribute_name = "Expire"
-    enabled        = true
-  }
-}
-
-resource "aws_dynamodb_table" "tunnelbroker-verification-messages" {
-  name           = "tunnelbroker-verification-messages"
-  hash_key       = "DeviceID"
-  write_capacity = 10
-  read_capacity  = 10
-
-  attribute {
-    name = "DeviceID"
-    type = "S"
-  }
-
-  ttl {
-    attribute_name = "Expire"
-    enabled        = true
-  }
-}
-
-resource "aws_dynamodb_table" "tunnelbroker-public-keys" {
-  name           = "tunnelbroker-public-keys"
-  hash_key       = "DeviceID"
-  write_capacity = 10
-  read_capacity  = 10
-
-  attribute {
-    name = "DeviceID"
-    type = "S"
-  }
-}
-
-resource "aws_dynamodb_table" "tunnelbroker-messages" {
-  name           = "tunnelbroker-messages"
-  hash_key       = "ToDeviceID"
-  range_key      = "MessageID"
-  write_capacity = 10
-  read_capacity  = 10
-
-  attribute {
-    name = "MessageID"
-    type = "S"
-  }
-
-  attribute {
-    name = "ToDeviceID"
-    type = "S"
-  }
-
-  ttl {
-    attribute_name = "Expire"
-    enabled        = true
-  }
-}
-
 resource "aws_dynamodb_table" "identity-users" {
   name           = "identity-users"
   hash_key       = "userID"