diff --git a/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay-test.eb b/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay-test.eb
index d8c44d2e..8fa97cbc 100644
--- a/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay-test.eb
+++ b/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay-test.eb
@@ -2,13 +2,13 @@ easyblock = 'CMakeMake'
 
 name = 'ParaView'
 version = '5.4.0'
-versionsuffix = '-mpi-OSPRay-test'
+versionsuffix = '-mpi-OSPRay-TEST'
 
 homepage = "http://www.paraview.org"
 description = "ParaView is a scientific parallel visualizer."
 
-toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
-toolchainopts = {'pic': True}
+toolchain = {'name': 'intel', 'version': '2017a'}
+toolchainopts = {'pic': True, 'usempi': True}
 
 download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=all&downloadFile='
 source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix]
@@ -16,13 +16,13 @@ sources = ["ParaView-v%(version)s.tar.gz"]
 
 dependencies = [
     ('X11', '20170314', '', True),
-    ('Mesa', '17.0.2', '', ('intel', '2017a')),
+    ('Mesa', '17.0.2'),
     ('libGLU', '9.0.0', '', True),
     ('Qt5', '5.8.0', '', ('GCC', '6.3.0-2.27')),
     ('zlib', '1.2.11', '', True),
-    ('HDF5', '1.8.17', '', ('intel', '2017a')),
+    ('HDF5', '1.8.17'),
     ('Python', '2.7.13', '', True),
-    ('OSPRay', '1.3.0', '', ('intel', '2017a'))
+    ('OSPRay', '1.3.0')
 ]
 
 builddependencies = [('CMake', '3.8.1', '', True)]
@@ -36,7 +36,7 @@ configopts += '-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s ' % SHLIB_EXT
 configopts += '-DVTK_USE_SYSTEM_HDF5=ON -DPARAVIEW_ENABLE_PYTHON=ON -DBUILD_SHARED_LIBS=ON -DVTK_RENDERING_BACKEND=OpenGL2 '
 configopts += '-DPARAVIEW_USE_OSPRAY=ON -DOSPRAY_INSTALL_DIR=$EBROOTOSPRAY -DPARAVIEW_QT_VERSION=5 '
 # if you want to build server only Paraview, uncomment the following line:
-configopts += '-DVTK_USE_X=OFF '
+configopts += '-DVTK_USE_X=OFF  -DVTK_USE_OFFSCREEN=ON '
 
 # Without internet connection turn off testing (uncomment the following line)
 configopts += '-DBUILD_TESTING=OFF '