Expand the pytest configuration (#1161)

And rely on it to run tests.

2 files changed, 6 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 94f5fd97..9e46a5a2 100644
--- a/Makefile
+++ b/Makefile
@@ -80,11 +80,11 @@ venv:
 
 test:
 	@echo $(H1)Running tests$(HEADER_EXTRA)$(H1END)
-	$(VENV_BIN)/python -m pytest $(COV) ./httpie $(COV) ./tests --doctest-modules --verbose ./httpie ./tests
+	$(VENV_BIN)/python -m pytest $(COV)
 	@echo
 
 
-test-cover: COV=--cov
+test-cover: COV=--cov=httpie --cov=tests
 test-cover: HEADER_EXTRA=' (with coverage)'
 test-cover: test
 
diff --git a/setup.cfg b/setup.cfg
index 43e47029..2deb39a7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,8 +7,10 @@
 
 [tool:pytest]
 # <https://docs.pytest.org/en/latest/customize.html>
-norecursedirs = tests/fixtures .*
-addopts = --tb=native --doctest-modules
+testpaths = httpie tests
+norecursedirs = tests/fixtures
+addopts = --tb=native --doctest-modules --verbose
+xfail_strict = True
 
 
 [flake8]