diff --git a/.github/labeler.yml b/.github/labeler.yml
index 5de0c3a7aa7..e83f2805c9f 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -15,9 +15,7 @@ c#:
 swift:
   - '**/*.swift'
   - swift/**/*
-  - tests/FlatBuffers.GRPC.Swift/**/*
-  - tests/FlatBuffers.Benchmarks.swift/**/*
-  - tests/FlatBuffers.Test.Swift/**/*
+  - tests/swift/**
   - src/idl_gen_swift.cpp
 
 javascript:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c9b90dfa7f..f8d42eb45c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -423,7 +423,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: test
-      working-directory: tests/FlatBuffers.Test.Swift
+      working-directory: tests/swift/tests
       run: sh SwiftTest.sh
 
   build-swift-wasm:
@@ -436,7 +436,7 @@ jobs:
       - name: Setup Wasmer
         uses: wasmerio/setup-wasmer@v1
       - name: Test
-        working-directory: tests/FlatBuffers.Test.Swift.Wasm
+        working-directory: tests/swift/Wasm.tests
         run: carton test
 
   build-ts:
diff --git a/docs/source/SwiftUsage.md b/docs/source/SwiftUsage.md
index 1c438f25f19..b10375e0be2 100644
--- a/docs/source/SwiftUsage.md
+++ b/docs/source/SwiftUsage.md
@@ -22,10 +22,10 @@ GitHub page](https://github.com/google/flatbuffers/tree/master/swift).
 
 ## Testing the FlatBuffers Swift library
 
-The code to test the Swift library can be found at `flatbuffers/Flatbuffers.Test.Swift`.
-The test code itself is located in [Flatbuffers.Test.Swift](https://github.com/google/flatbuffers/blob/master/tests/FlatBuffers.Test.Swift).
+The code to test the Swift library can be found at `flatbuffers/tests/swift/tests`.
+The test code itself is located in [flatbuffers/tests/swift/tests](https://github.com/google/flatbuffers/blob/master/tests/swift/tests).
 
-To run the tests, use the [SwiftTest.sh](https://github.com/google/flatbuffers/blob/master/tests/FlatBuffers.Test.Swift/SwiftTest.sh) shell script.
+To run the tests, use the [SwiftTest.sh](https://github.com/google/flatbuffers/blob/master/tests/swift/tests/SwiftTest.sh) shell script.
 
 *Note: The shell script requires [Swift](https://swift.org) to
 be installed.*
diff --git a/scripts/generate_code.py b/scripts/generate_code.py
index 53499b93882..743280240e1 100755
--- a/scripts/generate_code.py
+++ b/scripts/generate_code.py
@@ -64,7 +64,7 @@
 
 # Specify the other paths that will be referenced
 tests_path = Path(root_path, "tests")
-swift_code_gen = Path(root_path, "tests/FlatBuffers.Test.Swift/CodeGenerationTests")
+swift_code_gen = Path(root_path, "tests/swift/tests/CodeGenerationTests")
 samples_path = Path(root_path, "samples")
 reflection_path = Path(root_path, "reflection")
 
@@ -395,7 +395,7 @@ def glob(path, pattern):
 flatc(["--java", "--kotlin"], schema=dictionary_lookup_schema)
 
 # Swift Tests
-swift_prefix = "FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests"
+swift_prefix = "swift/tests/Tests/FlatBuffers.Test.SwiftTests"
 flatc(
     SWIFT_OPTS + BASE_OPTS + ["--grpc"],
     schema="monster_test.fbs",
diff --git a/tests/docker/languages/Dockerfile.testing.swift_5_2 b/tests/docker/languages/Dockerfile.testing.swift_5_2
index b30947775de..22995d247ba 100644
--- a/tests/docker/languages/Dockerfile.testing.swift_5_2
+++ b/tests/docker/languages/Dockerfile.testing.swift_5_2
@@ -4,5 +4,5 @@ ADD . .
 RUN cp flatc_debian_stretch flatc
 WORKDIR /code/tests
 RUN swift --version
-WORKDIR /code/tests/FlatBuffers.Test.Swift
+WORKDIR /code/tests/swift/tests/
 RUN sh SwiftTest.sh
diff --git a/tests/FlatBuffers.Test.Swift.Wasm/Package.swift b/tests/swift/Wasm.tests/Package.swift
similarity index 96%
rename from tests/FlatBuffers.Test.Swift.Wasm/Package.swift
rename to tests/swift/Wasm.tests/Package.swift
index 9ba50462199..6d3b1645a6e 100644
--- a/tests/FlatBuffers.Test.Swift.Wasm/Package.swift
+++ b/tests/swift/Wasm.tests/Package.swift
@@ -23,7 +23,7 @@ let package = Package(
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../swift/"),
+    .package(path: "../../../swift"),
   ],
   targets: [
     .target(
diff --git a/tests/FlatBuffers.Test.Swift.Wasm/Sources/Wasm/Wasm.swift b/tests/swift/Wasm.tests/Sources/Wasm/Wasm.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift.Wasm/Sources/Wasm/Wasm.swift
rename to tests/swift/Wasm.tests/Sources/Wasm/Wasm.swift
diff --git a/tests/FlatBuffers.Test.Swift.Wasm/Tests/FlatBuffers.Test.Swift.WasmTests/FlatBuffersMonsterWriterTests.swift b/tests/swift/Wasm.tests/Tests/FlatBuffers.Test.Swift.WasmTests/FlatBuffersMonsterWriterTests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift.Wasm/Tests/FlatBuffers.Test.Swift.WasmTests/FlatBuffersMonsterWriterTests.swift
rename to tests/swift/Wasm.tests/Tests/FlatBuffers.Test.Swift.WasmTests/FlatBuffersMonsterWriterTests.swift
diff --git a/tests/FlatBuffers.Test.Swift.Wasm/Tests/FlatBuffers.Test.Swift.WasmTests/monster_test_generated.swift b/tests/swift/Wasm.tests/Tests/FlatBuffers.Test.Swift.WasmTests/monster_test_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift.Wasm/Tests/FlatBuffers.Test.Swift.WasmTests/monster_test_generated.swift
rename to tests/swift/Wasm.tests/Tests/FlatBuffers.Test.Swift.WasmTests/monster_test_generated.swift
diff --git a/tests/FlatBuffers.Benchmarks.swift/Package.swift b/tests/swift/benchmarks/Package.swift
similarity index 89%
rename from tests/FlatBuffers.Benchmarks.swift/Package.swift
rename to tests/swift/benchmarks/Package.swift
index 66c557bc2c0..d7114932b72 100644
--- a/tests/FlatBuffers.Benchmarks.swift/Package.swift
+++ b/tests/swift/benchmarks/Package.swift
@@ -18,17 +18,17 @@
 import PackageDescription
 
 let package = Package(
-  name: "FlatBuffers.Benchmarks.swift",
+  name: "benchmarks",
   platforms: [
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../swift"),
+    .package(path: "../../../swift"),
     .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
   ],
   targets: [
     .target(
-      name: "FlatBuffers.Benchmarks.swift",
+      name: "benchmarks",
       dependencies: ["FlatBuffers",
                      .product(name: "Benchmark", package: "swift-benchmark")]),
   ])
diff --git a/tests/FlatBuffers.Benchmarks.swift/Sources/FlatBuffers.Benchmarks.swift/main.swift b/tests/swift/benchmarks/Sources/benchmarks/main.swift
similarity index 100%
rename from tests/FlatBuffers.Benchmarks.swift/Sources/FlatBuffers.Benchmarks.swift/main.swift
rename to tests/swift/benchmarks/Sources/benchmarks/main.swift
diff --git a/tests/FlatBuffers.Test.Swift/CodeGenerationTests/test_import.fbs b/tests/swift/tests/CodeGenerationTests/test_import.fbs
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/CodeGenerationTests/test_import.fbs
rename to tests/swift/tests/CodeGenerationTests/test_import.fbs
diff --git a/tests/FlatBuffers.Test.Swift/CodeGenerationTests/test_import_generated.swift b/tests/swift/tests/CodeGenerationTests/test_import_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/CodeGenerationTests/test_import_generated.swift
rename to tests/swift/tests/CodeGenerationTests/test_import_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/CodeGenerationTests/test_no_include.fbs b/tests/swift/tests/CodeGenerationTests/test_no_include.fbs
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/CodeGenerationTests/test_no_include.fbs
rename to tests/swift/tests/CodeGenerationTests/test_no_include.fbs
diff --git a/tests/FlatBuffers.Test.Swift/CodeGenerationTests/test_no_include_generated.swift b/tests/swift/tests/CodeGenerationTests/test_no_include_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/CodeGenerationTests/test_no_include_generated.swift
rename to tests/swift/tests/CodeGenerationTests/test_no_include_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/Package.swift b/tests/swift/tests/Package.swift
similarity index 96%
rename from tests/FlatBuffers.Test.Swift/Package.swift
rename to tests/swift/tests/Package.swift
index e2a53df90b7..64fcd540297 100644
--- a/tests/FlatBuffers.Test.Swift/Package.swift
+++ b/tests/swift/tests/Package.swift
@@ -24,7 +24,7 @@ let package = Package(
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../swift/"),
+    .package(path: "../../../swift"),
     .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.4.1"),
   ],
   targets: [
diff --git a/tests/FlatBuffers.Test.Swift/Sources/SwiftFlatBuffers/fuzzer.fbs b/tests/swift/tests/Sources/SwiftFlatBuffers/fuzzer.fbs
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Sources/SwiftFlatBuffers/fuzzer.fbs
rename to tests/swift/tests/Sources/SwiftFlatBuffers/fuzzer.fbs
diff --git a/tests/FlatBuffers.Test.Swift/Sources/SwiftFlatBuffers/fuzzer_generated.swift b/tests/swift/tests/Sources/SwiftFlatBuffers/fuzzer_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Sources/SwiftFlatBuffers/fuzzer_generated.swift
rename to tests/swift/tests/Sources/SwiftFlatBuffers/fuzzer_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/Sources/SwiftFlatBuffers/main.swift b/tests/swift/tests/Sources/SwiftFlatBuffers/main.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Sources/SwiftFlatBuffers/main.swift
rename to tests/swift/tests/Sources/SwiftFlatBuffers/main.swift
diff --git a/tests/FlatBuffers.Test.Swift/SwiftTest.sh b/tests/swift/tests/SwiftTest.sh
similarity index 80%
rename from tests/FlatBuffers.Test.Swift/SwiftTest.sh
rename to tests/swift/tests/SwiftTest.sh
index 08443eaf491..37563d4756d 100755
--- a/tests/FlatBuffers.Test.Swift/SwiftTest.sh
+++ b/tests/swift/tests/SwiftTest.sh
@@ -1,16 +1,18 @@
+current_dir=`pwd`
+cd ..
 swift_dir=`pwd`
 cd ..
 test_dir=`pwd`
 alias fbc='${test_dir}/../flatc'
 shopt -s expand_aliases
 
-cd ${swift_dir}/Tests/FlatBuffers.Test.SwiftTests
+cd ${current_dir}/Tests/FlatBuffers.Test.SwiftTests
 fbc --swift --gen-mutable --grpc --gen-json-emit --gen-object-api -I ${test_dir}/include_test ${test_dir}/monster_test.fbs ${test_dir}/union_vector/union_vector.fbs
 fbc --swift --gen-json-emit ${test_dir}/optional_scalars.fbs
 fbc --swift --gen-json-emit --gen-object-api ${test_dir}/more_defaults.fbs
 fbc --swift --gen-json-emit --gen-mutable --gen-object-api ${test_dir}/MutatingBool.fbs
-fbc --swift ${test_dir}/vector_has_test.fbs
-cd ${swift_dir}
+fbc --swift --gen-json-emit ${test_dir}/vector_has_test.fbs
+cd ${current_dir}
 
 # Goes into the code generation tests
 cd CodeGenerationTests
@@ -18,14 +20,14 @@ fbc --swift --gen-mutable --grpc --gen-json-emit --gen-object-api --swift-implem
 fbc --swift --gen-mutable --grpc --gen-json-emit --gen-object-api --no-includes test_no_include.fbs
 cd ..
 
-cd ${swift_dir}/Sources/SwiftFlatBuffers
+cd ${current_dir}/Sources/SwiftFlatBuffers
 # create better fuzzing test file
 fbc --swift --gen-json-emit fuzzer.fbs
-cd ${swift_dir}
+cd ${current_dir}
 
-cd ${test_dir}/Flatbuffers.Test.Swift.WASM/Tests/FlatBuffers.Test.Swift.WASMTests
+cd ${swift_dir}/Wasm.tests/Tests/FlatBuffers.Test.Swift.WasmTests
 fbc --swift --gen-mutable --gen-json-emit --gen-object-api -I ${test_dir}/include_test ${test_dir}/monster_test.fbs
-cd ${swift_dir}
+cd ${current_dir}
 
 swift build --build-tests
 swift test
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersMonsterWriterTests.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersMonsterWriterTests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersMonsterWriterTests.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersMonsterWriterTests.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersStructsTests.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersStructsTests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersStructsTests.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersStructsTests.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersTests.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersTests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersTests.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersTests.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersUnionTests.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersUnionTests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersUnionTests.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersUnionTests.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersVectorsTests.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersVectorsTests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersVectorsTests.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersVectorsTests.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersDoubleTests.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersDoubleTests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersDoubleTests.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersDoubleTests.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersMoreDefaults.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersMoreDefaults.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersMoreDefaults.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersMoreDefaults.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersVerifierTests.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersVerifierTests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersVerifierTests.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersVerifierTests.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/MutatingBool_generated.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/MutatingBool_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/MutatingBool_generated.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/MutatingBool_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/XCTestManifests.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/XCTestManifests.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/XCTestManifests.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/XCTestManifests.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/monster_test.grpc.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/monster_test.grpc.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/monster_test.grpc.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/monster_test.grpc.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/monster_test_generated.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/monster_test_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/monster_test_generated.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/monster_test_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/more_defaults_generated.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/more_defaults_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/more_defaults_generated.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/more_defaults_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/optional_scalars_generated.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/optional_scalars_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/optional_scalars_generated.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/optional_scalars_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/union_vector_generated.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/union_vector_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/union_vector_generated.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/union_vector_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/vector_has_test_generated.swift b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/vector_has_test_generated.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/FlatBuffers.Test.SwiftTests/vector_has_test_generated.swift
rename to tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/vector_has_test_generated.swift
diff --git a/tests/FlatBuffers.Test.Swift/Tests/LinuxMain.swift b/tests/swift/tests/Tests/LinuxMain.swift
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/Tests/LinuxMain.swift
rename to tests/swift/tests/Tests/LinuxMain.swift
diff --git a/tests/FlatBuffers.Test.Swift/monsterdata_test.mon b/tests/swift/tests/monsterdata_test.mon
similarity index 100%
rename from tests/FlatBuffers.Test.Swift/monsterdata_test.mon
rename to tests/swift/tests/monsterdata_test.mon