diff --git a/Makefile b/Makefile
index 00fbfbb55..3c146d0ba 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ export VERSION
 ################################################################################
 
 # Production test script
+FPGA_MODEL ?= Z10
 ENABLE_PRODUCTION_TEST ?= 0
 
 all:  sdr api nginx scpi examples rp_communication apps-tools apps-pro apps-free-vna production_test
@@ -443,7 +444,7 @@ production_test:
 ifeq ($(ENABLE_PRODUCTION_TEST), 1)
 	$(MAKE) -C $(PRODUCTION_TEST_DIR) clean
 	$(MAKE) -C $(PRODUCTION_TEST_DIR) INSTALL_DIR=$(abspath $(INSTALL_DIR))
-	$(MAKE) -C $(PRODUCTION_TEST_DIR) install INSTALL_DIR=$(abspath $(INSTALL_DIR))
+	$(MAKE) -C $(PRODUCTION_TEST_DIR) install INSTALL_DIR=$(abspath $(INSTALL_DIR)) MODEL=$(FPGA_MODEL)
 endif
 
 clean:
diff --git a/Test/production/Makefile b/Test/production/Makefile
index 1fec2ca37..551fb6008 100644
--- a/Test/production/Makefile
+++ b/Test/production/Makefile
@@ -1,6 +1,12 @@
 INSTALL_DIR ?= .
-BINARY_FILES = production_testing_script.sh calibration_script.sh delete_MAC.sh
+BINARY_FILES = calibration_script.sh delete_MAC.sh
 TEXT_FILES = environment_parameters.txt
+PRODUCTION_TESTING_SCRIPT = production_testing_script.sh
+MODEL ?= Z10
+
+ifeq ($(MODEL), Z20)
+PRODUCTION_TESTING_SCRIPT = production_testing_script_z20.sh
+endif
 
 all:
 
@@ -9,4 +15,5 @@ clean:
 install:
 	mkdir -p $(INSTALL_DIR)/bin
 	cp $(BINARY_FILES) $(INSTALL_DIR)/bin
+	cp $(PRODUCTION_TESTING_SCRIPT) $(INSTALL_DIR)/bin/production_testing_script.sh
 	cp $(TEXT_FILES) $(INSTALL_DIR)