diff --git a/doc/v2/runtime_configuration.running_specific_test.qbk b/doc/v2/runtime_configuration.running_specific_test.qbk
index 21e469e7..e00f6bdc 100644
--- a/doc/v2/runtime_configuration.running_specific_test.qbk
+++ b/doc/v2/runtime_configuration.running_specific_test.qbk
@@ -7,7 +7,7 @@ registered in master test suite.
   selected by the runtime parameter __param_run_test__. 
 # Symbol `,` is used to create list of test units residing on the same level in test tree
 # Filter expressions are specified in a form `a/b/c`, where `a`, `b` and `c` are filters for corresponding levels of test tree. 
-  Symbol `*` can be used at the beginning, at the end and as the level filter itself as an asterisk. 
+# Symbol `*` can be used at the beginning, at the end and as the level filter itself as an asterisk.
 
 
 
@@ -17,7 +17,7 @@ an appropriate environment variable value.
 
 Let's consider following test module consisting from several test suites and test cases:
 
-[\ snippet 18 deleted]
+[/ snippet 18 deleted]
 
 ``
 #define BOOST_TEST_MODULE example
@@ -49,9 +49,9 @@ BOOST_AUTO_TEST_SUITE_END()
   ]
   [
     [Run single test case by specifying it's name]
-    [__param_run_test__=<test-case-name>]
+    [[pre __param_run_test__=<test-case-name>]]
     [
-``
+[pre
 $ example --log_level=test_suite --__param_run_test__=testA
 Running 1 test case...
 Entering test suite "example"
@@ -61,14 +61,14 @@ Leaving test case "testA"
 Leaving test suite "example"
 
 *** No errors detected
-``    
+]
     ]
   ]
   [
     [Run multiple test cases residing within the same test suite by listing their names in coma separated list]
-    [__param_run_test__=<test-case-name1>,<test-case-name2>,...]
+    [[pre __param_run_test__=<test-case-name1>,<test-case-name2>,...]]
     [
-``
+[pre
 $ example --log_level=test_suite --__param_run_test__=testA,testB
 Running 2 test case...
 Entering test suite "example"
@@ -81,15 +81,15 @@ Leaving test case "testB"
 Leaving test suite "example"
 
 *** No errors detected    
-``
+]
     ]
   ]
   
   [
     [Run all test units within the referred test suites]
-    [__param_run_test__=<test-suite-name1>,<test-suite-name2>,...]
+    [[pre __param_run_test__=<test-suite-name1>,<test-suite-name2>,...]]
     [
-``
+[pre
 $ example --log_level=test_suite --__param_run_test__=s1
 Running 2 test cases...
 Entering test suite "example"
@@ -104,17 +104,17 @@ Leaving test suite "s1"
 Leaving test suite "example"
 
 *** No errors detected
-``
+]
     ]
   
   ]
   
   [
     [Run a specific test inside a test tree using `/`]
-    [__param_run_test__=<test-suite-hierarchy-level1>/<test-suite-hierarchy-level2>/.../<test-case>]
+    [[pre __param_run_test__=<hlevel1>/<hlevel2>/.../<test-case>]]
     [
 
-``
+[pre
 $ example --log_level=test_suite --__param_run_test__=s2/in/test
 Running 1 test case...
 Entering test suite "example"
@@ -128,7 +128,7 @@ Leaving test suite "s2"
 Leaving test suite "example"
 
 *** No errors detected
-`` 
+]
     ]
   ]
   
@@ -138,17 +138,18 @@ Leaving test suite "example"
 
 [warning Incorrect test case name may lead to no test to be run
 
-``
+[pre
 $ example --log_level=test_suite --__param_run_test__=testC
 Test setup error: no test cases matching filter
 ]
+]
 
 
 The __UTF__ supports simple regular expression-like `*` wildcard. Single `*` match any name of test unit. Accordingly
-expression 's1/*' is equivalent to the expression `s1` and matches all test units inside test suite `s1`. Similarly 
+expression `s1/*` is equivalent to the expression `s1` and matches all test units inside test suite `s1`. Similarly
 expression `*/test1` refers to all test units named `test1` that reside in master test suite's direct child suites.
 
-`` 
+[pre
 $ example --log_level=test_suite --__param_run_test__=*/test1
 Running 2 test cases...
 Entering test suite "example"
@@ -165,13 +166,13 @@ Leaving test suite "s2"
 Leaving test suite "example"
 
 *** No errors detected
-`` 
+]
 
 
 The __UTF__ allows to match specific prefix in test unit names. For example, expression `s2/test*` filters out only 
 test units in test suite `s2` with name that starts with `test`. This avoids running the test suite `s2/in`.
 
-`` 
+[pre
 $ example --log_level=test_suite --__param_run_test__=s2/test*
 Running 2 test cases...
 Entering test suite "example"
@@ -186,13 +187,13 @@ Leaving test suite "s2"
 Leaving test suite "example"
 
 *** No errors detected
-``
+]
 
 
-The __UTF__ allows to match specific suffix in test unit names. For example, expression '*/*1' filters out test units
-with name that ends with '1' and reside in master test suite's direct child suites.
+The __UTF__ allows to match specific suffix in test unit names. For example, expression `*/*1` filters out test units
+with name that ends with `1` and reside in master test suite's direct child suites.
 
-``
+[pre
 $ example --log_level=test_suite --__param_run_test__=*/*1
 Running 2 test cases...
 Entering test suite "example"
@@ -207,11 +208,12 @@ Leaving test suite "s2"
 Leaving test suite "example"
 
 *** No errors detected
-``
-
+]
+[warning quickbook is escaping things there, FIX IT]
 
 Finally, the __UTF__ allows to match specific substring in test unit names.
 
+[pre
 $ example --log_level=test_suite --__param_run_test__=s1/*est*
 Running 2 test cases...
 Entering test suite "example"
@@ -225,6 +227,7 @@ Leaving test case "lest2"
 Leaving test suite "s1"
 Leaving test suite "example"
 
-*** No errors detected</screen>
+*** No errors detected
+]
 
 [endsect]
diff --git a/doc/v2/test.qbk b/doc/v2/test.qbk
index dbac34b2..532d733b 100644
--- a/doc/v2/test.qbk
+++ b/doc/v2/test.qbk
@@ -148,7 +148,7 @@
 [/ Raffi: I think it would be better to put this in test variants]
 [include minimal-testing.qbk]
 
-[/[include runtime_configuration.qbk]]
+[include runtime_configuration.qbk]
 
 [include usage_recommandations.qbk]
 [include faq.qbk]