diff --git a/stdlib/3.4/pathlib.pyi b/stdlib/3.4/pathlib.pyi
index ef142a7c7fb0..796bce01cb99 100644
--- a/stdlib/3.4/pathlib.pyi
+++ b/stdlib/3.4/pathlib.pyi
@@ -22,8 +22,10 @@ class PurePath(_PurePathBase):
     stem = ...  # type: str
     if sys.version_info < (3, 5):
         def __init__(self, *pathsegments: str) -> None: ...
-    else:
+    elif sys.version_info < (3, 6):
         def __new__(cls: Type[_P], *args: Union[str, PurePath]) -> _P: ...
+    else:
+        def __new__(cls: Type[_P], *args: Union[str, os.PathLike]) -> _P: ...
     def __hash__(self) -> int: ...
     def __lt__(self, other: PurePath) -> bool: ...
     def __le__(self, other: PurePath) -> bool: ...
@@ -93,8 +95,12 @@ class Path(PurePath):
     if sys.version_info >= (3, 5):
         @classmethod
         def home(cls: Type[_P]) -> _P: ...
-        def __new__(cls: Type[_P], *args: Union[str, PurePath],
-                    **kwargs: Any) -> _P: ...
+        if sys.version_info < (3, 6):
+            def __new__(cls: Type[_P], *args: Union[str, PurePath],
+                        **kwargs: Any) -> _P: ...
+        else:
+            def __new__(cls: Type[_P], *args: Union[str, os.PathLike],
+                        **kwargs: Any) -> _P: ...
 
         def absolute(self: _P) -> _P: ...
         def expanduser(self: _P) -> _P: ...
diff --git a/stdlib/3/builtins.pyi b/stdlib/3/builtins.pyi
index b0669b118a14..93df5edef03d 100644
--- a/stdlib/3/builtins.pyi
+++ b/stdlib/3/builtins.pyi
@@ -795,8 +795,8 @@ def next(i: Iterator[_T], default: _VT) -> Union[_T, _VT]: ...
 def oct(i: int) -> str: ...  # TODO __index__
 
 if sys.version_info >= (3, 6):
-    from pathlib import Path
-    def open(file: Union[str, bytes, int, Path], mode: str = 'r', buffering: int = -1, encoding: str = None,
+    from os import PathLike
+    def open(file: Union[str, bytes, int, PathLike], mode: str = 'r', buffering: int = -1, encoding: str = None,
              errors: str = None, newline: str = None, closefd: bool = ...) -> IO[Any]: ...
 else:
     def open(file: Union[str, bytes, int], mode: str = 'r', buffering: int = -1, encoding: str = None,
diff --git a/stdlib/3/os/__init__.pyi b/stdlib/3/os/__init__.pyi
index ecf894e14c77..27d3780d8147 100644
--- a/stdlib/3/os/__init__.pyi
+++ b/stdlib/3/os/__init__.pyi
@@ -182,8 +182,24 @@ class statvfs_result:  # Unix only
     f_namemax = 0
 
 # ----- os function stubs -----
-def fsencode(filename: str) -> bytes: ...
-def fsdecode(filename: bytes) -> str: ...
+if sys.version_info >= (3, 6):
+    def fsencode(filename: Union[str, bytes, PathLike]) -> bytes: ...
+else:
+    def fsencode(filename: Union[str, bytes]) -> bytes: ...
+
+if sys.version_info >= (3, 6):
+    def fsdecode(filename: Union[str, bytes, PathLike]) -> str: ...
+else:
+    def fsdecode(filename: Union[str, bytes]) -> str: ...
+
+if sys.version_info >= (3, 6):
+    @overload
+    def fspath(path: str) -> str: ...
+    @overload
+    def fspath(path: bytes) -> bytes: ...
+    @overload
+    def fspath(path: PathLike) -> Any: ...
+
 def get_exec_path(env: Optional[Mapping[str, str]] = ...) -> List[str]: ...
 # NOTE: get_exec_path(): returns List[bytes] when env not None
 def ctermid() -> str: ...  # Unix only