diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes
index 9d467d2..59668d9 100644
--- a/cura-engine-lulzbot.changes
+++ b/cura-engine-lulzbot.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan  7 15:01:49 UTC 2019 - Adrian Schröter <adrian@suse.de>
+
+- update to version 3.6.1
+- run test suite during build
+
 -------------------------------------------------------------------
 Tue Nov 20 15:47:01 UTC 2018 - Adrian Schröter <adrian@suse.de>
 
diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec
index 9be18fb..fdd6d6f 100644
--- a/cura-engine-lulzbot.spec
+++ b/cura-engine-lulzbot.spec
@@ -26,6 +26,7 @@ Conflicts:      cura-engine
 Url:            https://code.alephobjects.com/diffusion/CTE/cura-engine.git
 Source0:        CuraEngine-%{version}.tar.xz
 Source1:        CuraEngine.1
+#Patch1:         fix-build.patch
 %if 0%{?suse_version} < 1500
 BuildRequires:  gcc6-c++
 #!BuildIgnore:  libgcc_s1
@@ -33,6 +34,7 @@ BuildRequires:  gcc6-c++
 BuildRequires:  gcc-c++
 %endif
 BuildRequires:  cmake
+BuildRequires:  cppunit-devel
 BuildRequires:  libArcus-devel
 BuildRequires:  stb-devel
 
@@ -45,22 +47,29 @@ This is the LulzBot variation of the engine.
 
 %prep
 %setup -q -n CuraEngine-%version
+#%patch1 -p1
 
 %build
 %if 0%{?suse_version} < 1500
 export CC=gcc-6
 export CXX=g++-6
 %endif
-%cmake -DCMAKE_C_FLAGS="%{optflags} -fPIC" \
-       -DCMAKE_CXX_FLAGS="%{optflags} -fPIC -fpermissive"
-make %{?_smp_mflags}
+%cmake -DCMAKE_POSITION_INDEPENDENT_CODE="true" \
+       -DBUILD_SHARED_LIBS="false" \
+       -DCMAKE_BUILD_TYPE=Release \
+       -DBUILD_TESTS=ON
+%make_jobs
 
 %install
 cd build
 %make_install
 
-install -Dm0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/CuraEngine-lulzbot.1
 mv %buildroot%_bindir/CuraEngine{,-lulzbot}
+install -Dm0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/CuraEngine-lulzbot.1
+
+%check
+cd build
+make test
 
 %files
 %license LICENSE