diff --git a/pytest_flake8.py b/pytest_flake8.py
index 2555f8a..1fdd34a 100644
--- a/pytest_flake8.py
+++ b/pytest_flake8.py
@@ -6,7 +6,7 @@
 from io import BytesIO, TextIOWrapper
 
 from flake8.main import application
-from flake8.options import config
+from flake8.options.parse_args import parse_args
 
 import pytest
 
@@ -213,21 +213,12 @@ def check_file(path, flake8ignore, maxlength, maxdoclenght, maxcomplexity,
     if statistics:
         args += ['--statistics']
     app = application.Application()
-    prelim_opts, remaining_args = app.parse_preliminary_options(args)
-    config_finder = config.ConfigFileFinder(
-        app.program,
-        prelim_opts.append_config,
-        config_file=prelim_opts.config,
-        ignore_config_files=prelim_opts.isolated,
-    )
-    app.find_plugins(config_finder)
-    app.register_plugin_options()
-    app.parse_configuration_and_cli(config_finder, remaining_args)
+    app.plugins, app.options = parse_args(args)
     if flake8ignore:
         app.options.ignore = flake8ignore
     app.make_formatter()  # fix this
     app.make_guide()
-    app.make_file_checker_manager()
+    app.make_file_checker_manager([])
     app.run_checks([str(path)])
     app.formatter.start()
     app.report_errors()
diff --git a/test_flake8.py b/test_flake8.py
index 0bc2461..e70860f 100644
--- a/test_flake8.py
+++ b/test_flake8.py
@@ -2,7 +2,6 @@
 """Unit tests for flake8 pytest plugin."""
 from __future__ import print_function
 
-import py
 import pytest
 
 pytest_plugins = "pytester",
@@ -44,8 +43,8 @@ def test_default_flake8_ignores(self, testdir):
 
             [flake8]
             ignore = E203
-                *.py E300
-                tests/*.py ALL E203  # something
+                E300
+                ALL E203
         """)
         testdir.tmpdir.ensure("xy.py")
         testdir.tmpdir.ensure("tests/hello.py")
@@ -164,13 +163,13 @@ def test_unicode_error(testdir):
     x = testdir.tmpdir.join("x.py")
     import codecs
     f = codecs.open(str(x), "w", encoding="utf8")
-    f.write(py.builtin._totext("""
+    f.write("""
 # coding=utf8
 
 accent_map = {
     u'\\xc0': 'a',  # À -> a  non-ascii comment crashes it
 }
-""", "utf8"))
+""")
     f.close()
     # result = testdir.runpytest("--flake8", x, "-s")
     # result.stdout.fnmatch_lines("*non-ascii comment*")