diff --git a/konqueror.spec b/konqueror.spec
index 0cb4f3e..8d8364a 100644
--- a/konqueror.spec
+++ b/konqueror.spec
@@ -5,6 +5,11 @@
 ## use webengine by default or not
 %global webengine_default 1
 
+## experimental ninja support
+#global ninja 1
+## FIXME: many tests require GLX, which doesn't appear to work as-is under koji
+#global tests 1
+
 Name:    konqueror
 Version: 18.12.2
 Release: 1%{?dist}
@@ -55,6 +60,16 @@ BuildRequires: cmake(Qt5Script)
 BuildRequires: cmake(Qt5Widgets)
 BuildRequires: cmake(Qt5X11Extras)
 
+%if 0%{?ninja}
+BuildRequires:  ninja-build
+%endif
+
+%if 0%{?tests}
+BuildRequires: dbus-x11
+BuildRequires: time
+BuildRequires: xorg-x11-server-Xvfb
+%endif
+
 BuildRequires: pkgconfig(zlib)
 BuildRequires: libtidy-devel
 
@@ -112,14 +127,25 @@ browsing the web in Konqueror.
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kf5} ..
+%{cmake_kf5} .. \
+  %{?ninja:-G Ninja} \
+  %{?tests:-DBUILD_TESTING:BOOL=ON}
 popd
 
+%if 0%{?ninja}
+%ninja_build -C %{_target_platform}
+%else
 %make_build -C %{_target_platform}
+%endif
 
 
 %install
+%if 0%{?ninja}
+%ninja_install -C %{_target_platform}
+%else
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%endif
+
 
 %find_lang %{name} --all-name --with-html
 
@@ -130,6 +156,16 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/kfmclient.desktop
 desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/kfmclient_html.desktop
 desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/kfmclient_war.desktop
 desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/konqbrowser.desktop
+%if 0%{?tests}
+export CTEST_OUTPUT_ON_FAILURE=1
+## cant use %%ninja_test here for some reason, doesn't inherit env vars from xvfb or dbus -- rex
+xvfb-run -a \
+%if 0%{?ninja}
+ninja test -v -C %{_target_platform} ||:
+%else
+make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
+%endif
+%endif
 
 
 %files -f %{name}.lang
@@ -149,7 +185,6 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/konqbrowser.deskt
 %{_kf5_datadir}/domtreeviewer/domtreeviewerui.rc
 %{_kf5_datadir}/fsview/
 %{_kf5_datadir}/icons/hicolor/*/*/*
-%{_kf5_datadir}/icons/oxygen/*/*/*
 %{_kf5_datadir}/kcmcss/
 %{_kf5_datadir}/kcontrol/
 %{_kf5_datadir}/kf5/kbookmark/
@@ -188,6 +223,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/konqbrowser.deskt
 %changelog
 * Wed Feb 20 2019 Rex Dieter <rdieter@fedoraproject.org> - 18.12.2-1
 - 18.12.2
+- optional ninja/tests support (not enabled by default)
 
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.12.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild