diff --git a/README.md b/README.md
index b1ec321cb72bc22fb4c480eb64c914af08251e51..5c25f63bcbf52f938c62b51034f4b530abc305b7 100644
--- a/README.md
+++ b/README.md
@@ -61,8 +61,8 @@ and extract it.
  5. Install: `make install` or `make DESTDIR=./install install` for local install.
  6. Run :)
 
-* *Optional step:* Generate documentation by executing `make doc`.
-* *Optional step:* Run tests with `make test`
+* *Optional step:* Generate documentation by executing `cd doc/userGuide; make`.
+* *Optional step:* Run tests with `make test` inside the build folder.
 
 
 Documentation
diff --git a/docs/userGuide/userGuide.tex b/docs/userGuide/userGuide.tex
index 11c2e093d4e12984a83c34efabdd2414326584f8..f89425f87d79bd5cd6f6dc026740e0e3720d4e73 100644
--- a/docs/userGuide/userGuide.tex
+++ b/docs/userGuide/userGuide.tex
@@ -599,10 +599,10 @@ The command line interface is available through aql2 executable and graphical in
 
 Optionaly the documentation can be generated by executing
 \begin{lstlisting}
-make doc
+cd doc/userGuide && make
 \end{lstlisting}
 
-Optional integration tests can be executed with
+Optional integration tests can be executed with from inside the build folder
 \begin{lstlisting}
 make test
 \end{lstlisting}