diff --git a/test-requirements.txt b/test-requirements.txt
index 210917b687..ba5157b709 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,3 @@
 selenium==2.42.1
 requests==2.3.0
-nose
+pytest
diff --git a/tests/api/test_files.py b/tests/api/test_files.py
index 8979be63e5..4a7b88ef0d 100644
--- a/tests/api/test_files.py
+++ b/tests/api/test_files.py
@@ -113,13 +113,13 @@ class FilesApiTest(ApiTestBase):
         with self.get_tmp_repo() as repo:
             upload_url = urljoin(repo.repo_url, 'upload-link')
             res = self.get(upload_url)
-            self.assertRegexpMatches(res.text, r'"http(.*)/upload-api/\w{8,8}"')
+            self.assertRegexpMatches(res.text, r'"http(.*)/upload-api/[^/]+"')
 
     def test_get_update_link(self):
         with self.get_tmp_repo() as repo:
             update_url = urljoin(repo.repo_url, 'update-link')
             res = self.get(update_url)
-            self.assertRegexpMatches(res.text, r'"http(.*)/update-api/\w{8,8}"')
+            self.assertRegexpMatches(res.text, r'"http(.*)/update-api/[^/]+"')
 
     # def test_upload_file(self):
     #     # XXX: requests has problems when post a file whose name contains
@@ -154,13 +154,13 @@ class FilesApiTest(ApiTestBase):
         with self.get_tmp_repo() as repo:
             upload_blks_url = urljoin(repo.repo_url, 'upload-blks-link')
             res = self.get(upload_blks_url)
-            self.assertRegexpMatches(res.text, r'"http(.*)/upload-blks-api/\w{8,8}"')
+            self.assertRegexpMatches(res.text, r'"http(.*)/upload-blks-api/[^/]+"')
 
     def test_get_update_blocks_link(self):
         with self.get_tmp_repo() as repo:
             update_blks_url = urljoin(repo.repo_url, 'update-blks-link')
             res = self.get(update_blks_url)
-            self.assertRegexpMatches(res.text, r'"http(.*)/update-blks-api/\w{8,8}"')
+            self.assertRegexpMatches(res.text, r'"http(.*)/update-blks-api/[^/]+"')
 
     def test_list_dir(self):
         with self.get_tmp_repo() as repo:
@@ -189,7 +189,7 @@ class FilesApiTest(ApiTestBase):
             ddurl = urljoin(repo.dir_url, 'download') + query
             res = self.get(ddurl)
             self.assertRegexpMatches(res.text,
-                r'"http(.*)/files/\w{8,8}/%s"' % quote(dpath[1:]))
+                r'"http(.*)/files/[^/]+/%s"' % quote(dpath[1:]))
 
     def test_share_dir(self):
         with self.get_tmp_repo() as repo:
diff --git a/tests/seahubtests.sh b/tests/seahubtests.sh
index 7ca40f3c5e..6c17fdddcf 100755
--- a/tests/seahubtests.sh
+++ b/tests/seahubtests.sh
@@ -54,7 +54,7 @@ function start_seahub() {
 function run_tests() {
     set +e
     cd tests
-    nosetests $nose_opts
+    py.test $nose_opts
     rvalue=$?
     cd -
     if [[ ${TRAVIS} != "" ]]; then