diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 099c3385..b3d83ddb 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -9,7 +9,7 @@
 
 export PYTHONUNBUFFERED=1
 
-if [ ! -d "./pysim-testdata/" ] ; then
+if [ ! -d "./tests/" ] ; then
 	echo "###############################################"
 	echo "Please call from pySim-prog top directory"
 	echo "###############################################"
@@ -29,10 +29,10 @@ case "$JOB_TYPE" in
 	# Execute automatically discovered unit tests first
 	python -m unittest discover -v -s tests/unittests
 
-	# Run the test with physical cards
-	cd pysim-testdata
-	../tests/pySim-prog_test.sh
-	cd ..
+	# Run pySim-prog integration tests (requires physical cards)
+	cd tests/pySim-prog_test/
+        ./pySim-prog_test.sh
+	cd ../../
 
 	# Run pySim-trace test
 	tests/pySim-trace_test/pySim-trace_test.sh
diff --git a/pysim-testdata/Fairwaves-SIM.data b/tests/pySim-prog_test/Fairwaves-SIM.data
similarity index 100%
rename from pysim-testdata/Fairwaves-SIM.data
rename to tests/pySim-prog_test/Fairwaves-SIM.data
diff --git a/pysim-testdata/Fairwaves-SIM.ok b/tests/pySim-prog_test/Fairwaves-SIM.ok
similarity index 100%
rename from pysim-testdata/Fairwaves-SIM.ok
rename to tests/pySim-prog_test/Fairwaves-SIM.ok
diff --git a/pysim-testdata/Wavemobile-SIM.data b/tests/pySim-prog_test/Wavemobile-SIM.data
similarity index 100%
rename from pysim-testdata/Wavemobile-SIM.data
rename to tests/pySim-prog_test/Wavemobile-SIM.data
diff --git a/pysim-testdata/Wavemobile-SIM.ok b/tests/pySim-prog_test/Wavemobile-SIM.ok
similarity index 100%
rename from pysim-testdata/Wavemobile-SIM.ok
rename to tests/pySim-prog_test/Wavemobile-SIM.ok
diff --git a/pysim-testdata/fakemagicsim.data b/tests/pySim-prog_test/fakemagicsim.data
similarity index 100%
rename from pysim-testdata/fakemagicsim.data
rename to tests/pySim-prog_test/fakemagicsim.data
diff --git a/pysim-testdata/fakemagicsim.ok b/tests/pySim-prog_test/fakemagicsim.ok
similarity index 100%
rename from pysim-testdata/fakemagicsim.ok
rename to tests/pySim-prog_test/fakemagicsim.ok
diff --git a/tests/pySim-prog_test.sh b/tests/pySim-prog_test/pySim-prog_test.sh
similarity index 98%
rename from tests/pySim-prog_test.sh
rename to tests/pySim-prog_test/pySim-prog_test.sh
index 28d97777..173822ac 100755
--- a/tests/pySim-prog_test.sh
+++ b/tests/pySim-prog_test/pySim-prog_test.sh
@@ -20,8 +20,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-PYSIM_PROG=../pySim-prog.py
-PYSIM_READ=../pySim-read.py
+PYSIM_PROG=../../pySim-prog.py
+PYSIM_READ=../../pySim-read.py
 TEMPFILE=temp.tmp
 PYTHON=python3
 
diff --git a/pysim-testdata/sysmoISIM-SJA2.data b/tests/pySim-prog_test/sysmoISIM-SJA2.data
similarity index 100%
rename from pysim-testdata/sysmoISIM-SJA2.data
rename to tests/pySim-prog_test/sysmoISIM-SJA2.data
diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/tests/pySim-prog_test/sysmoISIM-SJA2.ok
similarity index 100%
rename from pysim-testdata/sysmoISIM-SJA2.ok
rename to tests/pySim-prog_test/sysmoISIM-SJA2.ok
diff --git a/pysim-testdata/sysmoUSIM-SJS1.data b/tests/pySim-prog_test/sysmoUSIM-SJS1.data
similarity index 100%
rename from pysim-testdata/sysmoUSIM-SJS1.data
rename to tests/pySim-prog_test/sysmoUSIM-SJS1.data
diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/tests/pySim-prog_test/sysmoUSIM-SJS1.ok
similarity index 100%
rename from pysim-testdata/sysmoUSIM-SJS1.ok
rename to tests/pySim-prog_test/sysmoUSIM-SJS1.ok
diff --git a/pysim-testdata/sysmosim-gr1.data b/tests/pySim-prog_test/sysmosim-gr1.data
similarity index 100%
rename from pysim-testdata/sysmosim-gr1.data
rename to tests/pySim-prog_test/sysmosim-gr1.data
diff --git a/pysim-testdata/sysmosim-gr1.ok b/tests/pySim-prog_test/sysmosim-gr1.ok
similarity index 100%
rename from pysim-testdata/sysmosim-gr1.ok
rename to tests/pySim-prog_test/sysmosim-gr1.ok