diff --git a/pyvo/dal/tests/test_query.py b/pyvo/dal/tests/test_query.py
index e94ade935..8763f960d 100644
--- a/pyvo/dal/tests/test_query.py
+++ b/pyvo/dal/tests/test_query.py
@@ -5,10 +5,7 @@
 """
 from functools import partial
 
-try:
-    from contextlib import ExitStack
-except ImportError:
-    from contextlib2 import ExitStack
+from contextlib import ExitStack
 
 from os import listdir
 
diff --git a/pyvo/samp.py b/pyvo/samp.py
index f864a5047..535f1a872 100644
--- a/pyvo/samp.py
+++ b/pyvo/samp.py
@@ -6,10 +6,7 @@
 import os
 import tempfile
 
-try:
-    from astropy.samp import SAMPIntegratedClient
-except ImportError:
-    from astropy.vo.samp import SAMPIntegratedClient
+from astropy.samp import SAMPIntegratedClient
 
 
 __all__ = [