diff --git a/setup.py b/setup.py
index f36989d..7398f09 100644
--- a/setup.py
+++ b/setup.py
@@ -45,8 +45,6 @@ setup(
     scripts=['bin/yamllint'],
     package_data={'yamllint': ['conf/*.yml']},
     install_requires=['pyyaml'],
-    setup_requires=['pyyaml'],  # importing `yamllint` (for APP_NAME etc.)
-                                # requires importing `yaml`
     tests_require=['nose'],
     test_suite='nose.collector',
 )
diff --git a/tests/rules/common.py b/tests/rules/common.py
index ade842e..ed626d0 100644
--- a/tests/rules/common.py
+++ b/tests/rules/common.py
@@ -19,8 +19,7 @@ import unittest
 import yaml
 
 from yamllint.config import YamlLintConfig
-from yamllint.errors import LintProblem
-from yamllint import lint
+from yamllint import linter
 
 
 class RuleTestCase(unittest.TestCase):
@@ -44,9 +43,9 @@ class RuleTestCase(unittest.TestCase):
                     rule_id = kwargs[key][2]
             else:
                 rule_id = self.rule_id
-            expected_problems.append(
-                LintProblem(kwargs[key][0], kwargs[key][1], rule=rule_id))
+            expected_problems.append(linter.LintProblem(
+                kwargs[key][0], kwargs[key][1], rule=rule_id))
         expected_problems.sort()
 
-        real_problems = list(lint(source, self.build_fake_config(conf)))
+        real_problems = list(linter.run(source, self.build_fake_config(conf)))
         self.assertEqual(real_problems, expected_problems)