diff --git a/library/swift b/library/swift
new file mode 100644
index 0000000000000..4bff772f62213
--- /dev/null
+++ b/library/swift
@@ -0,0 +1,6 @@
+Maintainers: Haris Amin <aminharis7@gmail.com> (@hamin),
+             Thomas Catterall <me@swizzlr.co> (@swizzlr)
+GitRepo: https://github.com/swiftdocker/docker-swift.git
+
+Tags: 3.0.2, 3.0, 3, latest
+GitCommit: 94a43272fe6411c12045414cfc797d3c0bcf2823
diff --git a/test/config.sh b/test/config.sh
index a3da89d0375ac..4f52743c2427d 100644
--- a/test/config.sh
+++ b/test/config.sh
@@ -175,6 +175,9 @@ imageTests+=(
 	[silverpeas]='
 		silverpeas-basics
 	'
+	[swift]='
+		swift-hello-world
+  '
 	[tomcat]='
 		tomcat-hello-world
 	'
diff --git a/test/tests/run-swift-in-container.sh b/test/tests/run-swift-in-container.sh
new file mode 100755
index 0000000000000..75f9eb63a2784
--- /dev/null
+++ b/test/tests/run-swift-in-container.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")"
+runDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+source "$runDir/run-in-container.sh" "$testDir" "$1" swift ./container.swift
diff --git a/test/tests/swift-hello-world/container.swift b/test/tests/swift-hello-world/container.swift
new file mode 100644
index 0000000000000..f7cf60e14f9a9
--- /dev/null
+++ b/test/tests/swift-hello-world/container.swift
@@ -0,0 +1 @@
+print("Hello, world!")
diff --git a/test/tests/swift-hello-world/expected-std-out.txt b/test/tests/swift-hello-world/expected-std-out.txt
new file mode 100644
index 0000000000000..af5626b4a114a
--- /dev/null
+++ b/test/tests/swift-hello-world/expected-std-out.txt
@@ -0,0 +1 @@
+Hello, world!
diff --git a/test/tests/swift-hello-world/run.sh b/test/tests/swift-hello-world/run.sh
new file mode 120000
index 0000000000000..7e1c518ddc890
--- /dev/null
+++ b/test/tests/swift-hello-world/run.sh
@@ -0,0 +1 @@
+../run-swift-in-container.sh
\ No newline at end of file