diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 3814e787a..406c4b577 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -110,6 +110,18 @@
         :n "O" #'nosetests-pdb-one
         :n "V" #'nosetests-pdb-module))
 
+(def-package! python-pytest
+  :commands pytest-mode
+  :preface (defvar pytest-mode-map (make-sparse-keymap))
+  :init (associate! pytest-mode :match "/test_.+\\.py$" :modes (python-mode))
+  (set-yas-minor-mode! 'pytest-mode)
+  (when (featurep 'evil)
+    (add-hook 'pytest-mode-hook #'evil-normalize-keymaps))
+
+  (map! :map nose-mode-map
+        :localleader
+        :prefix "t"
+        :n "r" #'nosetests-again))
 
 ;;
 ;; Environment management
diff --git a/modules/lang/python/packages.el b/modules/lang/python/packages.el
index 1c30b8bf1..cfe418184 100644
--- a/modules/lang/python/packages.el
+++ b/modules/lang/python/packages.el
@@ -4,6 +4,7 @@
 ;; requires: python setuptools
 
 (package! nose)
+(package! python-pytest)
 (package! pip-requirements)
 
 ;; Environmet management