diff --git a/pytest.ini b/pytest.ini
index b606fa5f..e3d8c35e 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,11 +1,13 @@
 [pytest]
 testpaths = tests
 python_paths = .
-addopts = -v --tb=short
 python_files = test_*.py
 python_classes = Test*
 python_functions = test_*
 log_file = logs/test_logs.log
 log_file_level = INFO
 log_file_format = %(asctime)s %(levelname)s %(message)s
-log_file_date_format = %Y-%m-%d %H:%M:%S
\ No newline at end of file
+log_file_date_format = %Y-%m-%d %H:%M:%S
+# Only run non-expensive tests by default, verbose log, short traceback
+# Use 'pytest -m ""' to run ALL tests.
+addopts = -v --tb=short -m 'not expensive'