diff --git a/m/MATLAB/MATLAB-2015b.eb b/m/MATLAB/MATLAB-2015b.eb
new file mode 100644
index 00000000..09bbdece
--- /dev/null
+++ b/m/MATLAB/MATLAB-2015b.eb
@@ -0,0 +1,25 @@
+# eb MATLAB-2013a.eb -r --include-easyblocks /apps/easybuild/python/easybuild/easyblocks/m/matlab.py
+name = 'MATLAB'
+version = '2015b'
+versionsuffix = '-EDU-test'
+
+homepage = 'http://www.mathworks.com/products/matlab'
+description = """MATLAB is a high-level language and interactive environment
+ that enables you to perform computationally intensive tasks faster than with
+ traditional programming languages such as C, C++, and Fortran."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Java', '1.8.0_121')
+]
+
+import os
+license_server = os.getenv('EB_MATLAB_LICENSE_SERVER', 'licedu.it4i.cz')
+license_server_port = os.getenv('EB_MATLAB_LICENSE_SERVER_PORT', '27010')
+key = os.getenv('EB_MATLAB_KEY', '31436-08209-25612-60500-02539-46860-32436-47249-45889-28649-10493-63042-37692-64719-31236-62574-35032-59551')
+exts_defaultclass = os.getenv('EB_MATLAB_KEY', '45771-53699-35271-44920-00140-27727-41599-08721-28943-58889-44878-45933')
+
+moduleclass = 'math'
diff --git a/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb b/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-old.eb
similarity index 77%
rename from t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb
rename to t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-old.eb
index 11ee530a..a134d15d 100644
--- a/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb
+++ b/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-old.eb
@@ -2,7 +2,7 @@
 
 name = 'Trilinos'
 version = '12.10.1'
-versionsuffix = '-Python-2.7.11-test'
+versionsuffix = '-Python-2.7.11'
 
 homepage = 'http://trilinos.sandia.gov/'
 description = """The Trilinos Project is an effort to develop algorithms and enabling technologies
@@ -15,14 +15,14 @@ toolchainopts = {'usempi': True, 'pic': True, 'strict': True}
 source_urls = ['http://trilinos.csbsju.edu/download/files/']
 sources = ['%(namelower)s-%(version)s-Source.tar.gz']
 
-patches = ['Trilinos-12.10.1-muelu.patch']
+patches = ['fix-parmetis.patch']
 
 builddependencies = [
     ('CMake', '3.5.2', '', True),
 ]
 
 dependencies = [
-    ('Boost', '1.63.0', '-Python-2.7.11'),
+    ('Boost', '1.63.0', versionsuffix),
     ('SCOTCH', '6.0.4'),
     ('SuiteSparse', '4.5.3', '-ParMETIS-4.0.3'),
     ('ParMETIS', '4.0.3'),
@@ -35,9 +35,9 @@ dependencies = [
 # see https://trilinos.org/oldsite/release_notes-11.10.html and https://github.com/trilinos/Trilinos/issues/19
 #skip_exts = ['STKClassic', 'STKDoc_tests']
 
-prebuildopts = 'for NAME in `find -name link.txt`; do cp $NAME $NAME.old; sed -e "s/libcholmod.a/libcholmod.a -lmetis -lcamd -lccolamd/g" $NAME.old | tee $NAME; done &&'
+prebuildopts = 'for NAME in `find -name link.txt`; do cat $NAME | sed -e "s/libcholmod.a/libcholmod.a -lmetis -lcamd -lccolamd/g" | tee $NAME; done &&'                                                                                         
 
 # too parallel is too slow, and may cause build/tests to fail
-maxparallel = 16
+maxparallel = 1 
 
 moduleclass = 'numlib'
diff --git a/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11.eb b/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11.eb
index a134d15d..b2e23043 100644
--- a/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11.eb
+++ b/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11.eb
@@ -15,14 +15,14 @@ toolchainopts = {'usempi': True, 'pic': True, 'strict': True}
 source_urls = ['http://trilinos.csbsju.edu/download/files/']
 sources = ['%(namelower)s-%(version)s-Source.tar.gz']
 
-patches = ['fix-parmetis.patch']
+patches = ['Trilinos-12.10.1-muelu.patch']
 
 builddependencies = [
     ('CMake', '3.5.2', '', True),
 ]
 
 dependencies = [
-    ('Boost', '1.63.0', versionsuffix),
+    ('Boost', '1.63.0', '-Python-2.7.11'),
     ('SCOTCH', '6.0.4'),
     ('SuiteSparse', '4.5.3', '-ParMETIS-4.0.3'),
     ('ParMETIS', '4.0.3'),
@@ -35,9 +35,9 @@ dependencies = [
 # see https://trilinos.org/oldsite/release_notes-11.10.html and https://github.com/trilinos/Trilinos/issues/19
 #skip_exts = ['STKClassic', 'STKDoc_tests']
 
-prebuildopts = 'for NAME in `find -name link.txt`; do cat $NAME | sed -e "s/libcholmod.a/libcholmod.a -lmetis -lcamd -lccolamd/g" | tee $NAME; done &&'                                                                                         
+prebuildopts = 'for NAME in `find -name link.txt`; do cp $NAME $NAME.old; sed -e "s/libcholmod.a/libcholmod.a -lmetis -lcamd -lccolamd/g" $NAME.old | tee $NAME; done &&'
 
 # too parallel is too slow, and may cause build/tests to fail
-maxparallel = 1 
+maxparallel = 16
 
 moduleclass = 'numlib'