diff --git a/testing/scripts/recipes/014_swid_generator.mk b/testing/scripts/recipes/014_swid_generator.mk
index 589146906..3394620e2 100644
--- a/testing/scripts/recipes/014_swid_generator.mk
+++ b/testing/scripts/recipes/014_swid_generator.mk
@@ -1,16 +1,20 @@
 #!/usr/bin/make
 
 PKG = swidGenerator
-ZIP = $(PKG)-master.zip
-SRC = https://github.com/strongswan/$(PKG)/archive/master.zip
+REV = v1.1.0
+DIR = $(PKG)-$(REV)
+TAR = $(PKG)-$(REV).tar.gz
+SRC = https://github.com/strongswan/$(PKG)/archive/$(REV).tar.gz
 
 all: install
 
-$(ZIP):
-	wget --ca-directory="/usr/share/ca-certificates/mozilla" $(SRC) -O $(ZIP)
+$(TAR):
+	wget --ca-directory="/usr/share/ca-certificates/mozilla" $(SRC) -O $(TAR)
 
-$(PKG)-master: $(ZIP)
-	unzip $(ZIP)
+.$(PKG)-unpacked-$(REV): $(TAR)
+	# a tag's "v" prefix is not reflected in the directory name in the archive
+	[ -d $(DIR) ] || (mkdir -p $(DIR); tar -xf $(TAR) --strip-components=1 -C $(DIR))
+	@touch $@
 
-install: $(PKG)-master
-	cd $(PKG)-master && python setup.py install
+install: .$(PKG)-unpacked-$(REV)
+	cd $(DIR) && python setup.py install
diff --git a/testing/scripts/recipes/015_strongTNC.mk b/testing/scripts/recipes/015_strongTNC.mk
index 51c9894c6..b94a3114a 100644
--- a/testing/scripts/recipes/015_strongTNC.mk
+++ b/testing/scripts/recipes/015_strongTNC.mk
@@ -1,8 +1,10 @@
 #!/usr/bin/make
 
 PKG = strongTNC
-ZIP = $(PKG)-master.zip
-SRC = https://github.com/strongswan/$(PKG)/archive/master.zip
+REV = 0.9.9
+DIR = $(PKG)-$(REV)
+ZIP = $(PKG)-$(REV).zip
+SRC = https://github.com/strongswan/$(PKG)/archive/$(REV).zip
 DEPS = $(PKG)-deps
 
 all: install
@@ -10,14 +12,16 @@ all: install
 $(ZIP):
 	wget --ca-directory=/usr/share/ca-certificates/mozilla/ $(SRC) -O $(ZIP)
 
-$(PKG)-master: $(ZIP)
-	unzip -u $(ZIP)
+.$(PKG)-unpacked-$(REV): $(ZIP)
+	[ -d $(DIR) ] || unzip $(ZIP)
+	@touch $@
 
-$(DEPS): $(PKG)-master
+.$(PKG)-deps-$(REV): .$(PKG)-unpacked-$(REV)
 	mkdir -p $(DEPS)
-	pip download -d $(DEPS) -r $(PKG)-master/requirements.txt six
+	pip download -d $(DEPS) -r $(DIR)/requirements.txt six
+	@touch $@
 
-install: $(DEPS)
+install: .$(PKG)-deps-$(REV)
 	# six is required for djangorestframework-camel-case
-	pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(PKG)-master/requirements.txt six
-	cp -r $(PKG)-master /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc
+	pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt six
+	cp -r $(DIR) /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc