diff --git a/Makefile b/Makefile
index b8d4d589f..d9e4d318f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1)
 SOURCEFILES?=$(shell find pandoc.hs src test -name '*.hs')
 BRANCH?=master
 RESOLVER=lts-12
-GHCOPTS=-fdiagnostics-color=always -Wall -fno-warn-unused-do-bind -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -Wincomplete-uni-patterns -Werror=missing-home-modules -Widentities -Wcpp-undef -j +RTS -A32M -RTS
+GHCOPTS=-fdiagnostics-color=always -Wall -fno-warn-unused-do-bind -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -Wincomplete-uni-patterns -Werror=missing-home-modules -Widentities -Wcpp-undef -fhide-source-paths -j +RTS -A32M -RTS
 # Later:
 # -Wpartial-fields        (currently used in Powerpoint writer)
 # -Wmissing-export-lists  (currently some Odt modules violate this)
@@ -11,9 +11,10 @@ GHCOPTS=-fdiagnostics-color=always -Wall -fno-warn-unused-do-bind -Wincomplete-r
 WEBSITE=../../web/pandoc.org
 
 quick-cabal:
-	cabal new-build . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files' --enable-tests
+	cabal new-build . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files' --enable-tests --only-dependencies
+	cabal new-build . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files' --enable-tests --disable-optimization
 	cabal new-install --symlink-bindir=$$HOME/.local/bin
-	cabal new-run test-pandoc --ghc-options '$(GHCOPTS)' --flags '+embed_data_files' -- -j4 --hide-successes $(TESTARGS)
+	cabal new-run test-pandoc --ghc-options '$(GHCOPTS)' --flags '+embed_data_files' --disable-optimization -- --hide-successes $(TESTARGS)
 
 quick:
 	stack install --resolver=$(RESOLVER) --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --test-arguments='-j4 --hide-successes $(TESTARGS)'