diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index d1029a6bcdec45d8d010faccef3d2691c7526ae8..94d28969b3235ad76ed72e64daf12980fd1930a4 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -7,7 +7,7 @@ set(PYTHON_MODULES_TEST
 foreach(module ${PYTHON_MODULES_TEST})
   add_test(NAME generator/${module}
 	  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	  COMMAND env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/../ python ${CMAKE_CURRENT_SOURCE_DIR}/${module}.py)
+	  COMMAND env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/../ python3 ${CMAKE_CURRENT_SOURCE_DIR}/${module}.py)
 endforeach(module)
 
 SET(COREDOS_GENERATOR_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "")
diff --git a/generator/LLVMPYAnalysis.py b/generator/LLVMPYAnalysis.py
old mode 100755
new mode 100644
index 34381262b84c575c60d0014841ecc0d9a3f0d0e2..9da28a7d26771b63e616a3b7f7c86534c9ec29a0
--- a/generator/LLVMPYAnalysis.py
+++ b/generator/LLVMPYAnalysis.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import llvm
 import llvm.core
 import sys
diff --git a/generator/RTSCAnalysis.py b/generator/RTSCAnalysis.py
index 34f85c3f9ebcc07e6004ec55f8592df86fad0195..02f6052b5a0866048448d42c3a5565be8e423904 100644
--- a/generator/RTSCAnalysis.py
+++ b/generator/RTSCAnalysis.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 from lxml import objectify
 
 from collections import namedtuple
diff --git a/generator/SystemDescription.py b/generator/SystemDescription.py
old mode 100755
new mode 100644
index 2a73c98ebbc135b05d2e3f3705b337d4ca66b9cf..03242ba760e7f715686030f566fad13e94d236b4
--- a/generator/SystemDescription.py
+++ b/generator/SystemDescription.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 from lxml import objectify
 import os
 from collections import namedtuple
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 75322a7789bc9e9a469a014e5265867b4a6ecfd7..345e14d6627d72f5ac23385de30950f067142ec6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -39,7 +39,7 @@ add_custom_target( ctest2jenkins
 add_custom_command(
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     COMMAND ctest -V  -D ExperimentalTest || true
-    COMMAND python ${CONVERTPY} ${PROJECT_BINARY_DIR} ${CONVXSL} > BaseTest.xml
+    COMMAND python3 ${CONVERTPY} ${PROJECT_BINARY_DIR} ${CONVXSL} > BaseTest.xml
     DEPENDS tests
     OUTPUT ${XUNITOUTPUT}
 )
diff --git a/toolchain/ctest2jenkins/convert.py b/toolchain/ctest2jenkins/convert.py
index abb80692c237941e550177e017fd54b50a4e2bd4..36c752ff49397b89759859cc797512e86f2c5a02 100644
--- a/toolchain/ctest2jenkins/convert.py
+++ b/toolchain/ctest2jenkins/convert.py
@@ -1,18 +1,14 @@
 from lxml import etree
-import StringIO
 import sys
 
 TAGfile = open(sys.argv[1]+"/Testing/TAG", 'r')
 dirname = TAGfile.readline().strip()
 
-xmlfile = open(sys.argv[1]+"/Testing/"+dirname+"/Test.xml", 'r')
-xslfile = open(sys.argv[2], 'r')
+xmlfile = sys.argv[1]+"/Testing/"+dirname+"/Test.xml"
+xslfile = sys.argv[2]
 
-xmlcontent = xmlfile.read()
-xslcontent = xslfile.read()
-
-xmldoc = etree.parse(StringIO.StringIO(xmlcontent))
-xslt_root = etree.XML(xslcontent)
+xmldoc = etree.parse(xmlfile)
+xslt_root = etree.parse(xslfile)
 transform = etree.XSLT(xslt_root)
 
 result_tree = transform(xmldoc)