diff --git a/.travis.yml b/.travis.yml
index 79ebf425..71fc6be8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,9 @@ python:
 - '3.4'
 - '3.5'
 - '3.6'
+- '3.7'
+- '3.8-dev'
+dist: xenial  # needed for 3.7+
 env:
 - TOXENV=py-test
 
diff --git a/src/setuptools_scm/utils.py b/src/setuptools_scm/utils.py
index 7e4e9f53..5b59005a 100644
--- a/src/setuptools_scm/utils.py
+++ b/src/setuptools_scm/utils.py
@@ -100,7 +100,8 @@ def function_has_arg(fn, argname):
     if PY2:
         argspec = inspect.getargspec(fn).args
     else:
-        argspec = inspect.getfullargspec(fn).args
+
+        argspec = inspect.signature(fn).parameters
 
     return argname in argspec
 
diff --git a/tox.ini b/tox.ini
index f06b6317..129f9b47 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,10 @@
 [tox]
-envlist=py{27,34,35,36,37}-test,flake8,check_readme,py{27,37}-selfcheck
+envlist=py{27,34,35,36,37,38}-test,flake8,check_readme,py{27,37}-selfcheck
 
 [pytest]
 filterwarnings=error
+markers=
+    issue(id): reference to github issue
 
 [flake8]
 max-complexity = 10