diff --git a/exiv2.md b/exiv2.md
index 8b83d491..e50e1c14 100644
--- a/exiv2.md
+++ b/exiv2.md
@@ -1326,7 +1326,7 @@ standards-defined metadata.
 With [--Modify cmd](#Modify_cmd), quotation marks are use to surround the 
 *cmd*. The Windows command line requires double quotes to be 
 used, however generally, quotes inside that string, can be either single 
-or double. Generally, UNIX based systems can use pairs of single or 
+or double. Generally, Unix-based systems can use pairs of single or 
 double quotes in any position. In both systems, inner string quotation 
 marks may need to use the `\` escape sequence.
 
@@ -1634,11 +1634,11 @@ For another example, see: https://www.exiv2.org/sample.html
 
 # 12 CONFIGURATION FILE
 **exiv2** can read an optional configuration file, which allows 
-additional lens definitions to be added to translated output. On UNIX 
-based systems, this file is called *.exiv2* and on Windows (including MinGW), 
-*exiv2.ini*. The file is searched for first in the current directory, 
-then in the home directory (on UNIX based systems, `~/` and on Windows, 
-`%USERPROFILE%\\`).
+additional lens definitions to be added to translated output. On Unix-based 
+systems (including Cygwin), this file is called *.exiv2* and on Windows 
+(including MinGW), *exiv2.ini*. The file is searched for first in the 
+current directory, then in the home directory (`$HOME` on Unix-based 
+systems, and `%USERPROFILE%` on Windows).
 
 You can determine the name of the file and where it is searched for, 
 with the command:
diff --git a/tests/lens_tests/test_config_file.py b/tests/lens_tests/test_config_file.py
index 667ca78d..14b3c417 100644
--- a/tests/lens_tests/test_config_file.py
+++ b/tests/lens_tests/test_config_file.py
@@ -6,11 +6,11 @@ import sys
 
 
 # copy the example config file into current working directory
-# and name it ".exiv2" on linux or "exiv2.ini" on Win
+# and name it "exiv2.ini" on Win or ".exiv2" on other platforms
 class TmpConfigFile(system_tests.FileDecoratorBase):
     def setUp_file_action(self, expanded_file_name):
         config_file_path = os.path.dirname(os.path.abspath(__file__))
-        fname = ".exiv2" if sys.platform == "linux" or sys.platform == "darwin" else "exiv2.ini"
+        fname = os.path.basename(system_tests.BT.verbose_version().get('config_path'))
         return shutil.copyfile(expanded_file_name, os.path.join(config_file_path, fname))