diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
index 38843b0ee..83d7ef304 100755
--- a/psutil/tests/test_system.py
+++ b/psutil/tests/test_system.py
@@ -501,11 +501,8 @@ def test_disk_partitions(self):
                 # we cannot make any assumption about this, see:
                 # http://goo.gl/p9c43
                 disk.device
-            if SUNOS or TRAVIS:
-                # on solaris apparently mount points can also be files
-                assert os.path.exists(disk.mountpoint), disk
-            else:
-                assert os.path.isdir(disk.mountpoint), disk
+            # on modern systems mount points can also be files
+            assert os.path.exists(disk.mountpoint), disk
             assert disk.fstype, disk
 
         # all = True