diff --git a/Tests/Functional/TestMachinery/TestUtils.cpp b/Tests/Functional/TestMachinery/TestUtils.cpp
index 6f760aa473ffc99cf2c81a0758cb2177ea4c88a6..7dd2c55c5bec889e1e513058a23aa7ea9500ac92 100644
--- a/Tests/Functional/TestMachinery/TestUtils.cpp
+++ b/Tests/Functional/TestMachinery/TestUtils.cpp
@@ -56,10 +56,10 @@ bool TestUtils::runPython(const std::string& py_command)
 {
 #ifndef _WIN32
     std::string sys_command = std::string("PYTHONPATH=") + BABuild::buildLibDir() + " " +
-        BABuild::pythonExecutable() + " -B " + py_command;
+        std::string("NOPLOT=TRUE") + " " + BABuild::pythonExecutable() + " -B " + py_command;
 #else
     std::string sys_command = std::string("set PYTHONPATH=") + BABuild::buildLibDir() + " & " +
-        BABuild::pythonExecutable() + " -B " + py_command;
+        std::string("set NOPLOT=TRUE") + " & " +BABuild::pythonExecutable() + " -B " + py_command;
 #endif
     std::cout << sys_command << std::endl/*sic*/; // flush output before calling std::system
     int ret = std::system(sys_command.c_str());
diff --git a/Wrap/python/__init__.py.in b/Wrap/python/__init__.py.in
index fba2cc3c9b7ffabd42a014db32b896e590c623b6..08525617891a74e3b7e1af9dace8a17893ab9551 100644
--- a/Wrap/python/__init__.py.in
+++ b/Wrap/python/__init__.py.in
@@ -10,6 +10,9 @@ from libBornAgainCore import *
 # this line needed to fix python3 import problem
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 
-from plot_utils import *
+# To prevent inclusion of plotting tools during functional tests:
+if not "NOPLOT" in os.environ:
+    from plot_utils import *
+
 from yaml_utils import *
 
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 57c9031ddda58dd59f98b64f7020efe2c2929c0e..7f164679245507f3bcf5d53d4c50845428e2bb66 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -5994,7 +5994,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_  (PyObject *o, std::complex<double>* val)
 
 
 SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
 
 const std::complex<double>&
 
diff --git a/auto/Wrap/libBornAgainFit_wrap.cpp b/auto/Wrap/libBornAgainFit_wrap.cpp
index 617136d9188b3bc02930aebfb99c1fa08f163078..182abc5541c99f92f98a78439a7f630a79c6657c 100644
--- a/auto/Wrap/libBornAgainFit_wrap.cpp
+++ b/auto/Wrap/libBornAgainFit_wrap.cpp
@@ -5627,7 +5627,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_  (PyObject *o, std::complex<double>* val)
 
 
 SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
 
 const std::complex<double>&