diff --git a/ggsn-test/.release b/ggsn-test/.release
deleted file mode 100644
index 8f51a72b..00000000
--- a/ggsn-test/.release
+++ /dev/null
@@ -1,2 +0,0 @@
-release=0.1.0
-tag=ggsn-test-0.1.0
diff --git a/ggsn-test/Makefile b/ggsn-test/Makefile
deleted file mode 100644
index c4999f8a..00000000
--- a/ggsn-test/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.3.202 -v ggsn-test-vol:/data
-
-include ../make/Makefile
diff --git a/ttcn3-ggsn-test/.release b/ttcn3-ggsn-test/.release
new file mode 100644
index 00000000..ef3f7baf
--- /dev/null
+++ b/ttcn3-ggsn-test/.release
@@ -0,0 +1,2 @@
+release=0.1.0
+tag=ttcn3-ggsn-test-0.1.0
diff --git a/ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile
similarity index 100%
rename from ggsn-test/Dockerfile
rename to ttcn3-ggsn-test/Dockerfile
diff --git a/ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/GGSN_Tests.cfg
similarity index 100%
rename from ggsn-test/GGSN_Tests.cfg
rename to ttcn3-ggsn-test/GGSN_Tests.cfg
diff --git a/ttcn3-ggsn-test/Makefile b/ttcn3-ggsn-test/Makefile
new file mode 100644
index 00000000..8d0e10b4
--- /dev/null
+++ b/ttcn3-ggsn-test/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh
similarity index 97%
rename from ggsn-test/jenkins.sh
rename to ttcn3-ggsn-test/jenkins.sh
index 0f80aed8..56f76ecd 100755
--- a/ggsn-test/jenkins.sh
+++ b/ttcn3-ggsn-test/jenkins.sh
@@ -28,7 +28,7 @@ docker run	--rm \
 		-v $VOL_BASE_DIR/ggsn-tester:/data \
 		-e "TTCN3_PCAP_PATH=/data" \
 		--name ${BUILD_TAG}-ggsn-test \
-		$REPO_USER/ggsn-test
+		$REPO_USER/ttcn3-ggsn-test
 
 # stop GGSN after test has completed
 docker container stop ${BUILD_TAG}-ggsn
diff --git a/ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg
similarity index 100%
rename from ggsn-test/osmo-ggsn.cfg
rename to ttcn3-ggsn-test/osmo-ggsn.cfg