diff --git a/templates/latex.template b/templates/latex.template
index 30ecf8a3e..fb40d506a 100644
--- a/templates/latex.template
+++ b/templates/latex.template
@@ -20,8 +20,6 @@ $if(lhs)$
 \usepackage{listings}
 \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
 $endif$
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{6pt plus 2pt minus 1pt}
 $endif$
 $if(verbatim-in-note)$
 \usepackage{fancyvrb}
@@ -41,15 +39,15 @@ $endif$
 $if(subscript)$
 \newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}
 $endif$
-$if(links)$
-\usepackage[breaklinks=true]{hyperref}
-$endif$
 $if(url)$
 \usepackage{url}
 $endif$
 $if(graphics)$
 \usepackage{graphicx}
 $endif$
+\usepackage[breaklinks=true,unicode=true]{hyperref}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{6pt plus 2pt minus 1pt}
 $if(numbersections)$
 $else$
 \setcounter{secnumdepth}{0}
diff --git a/tests/latex-reader.latex b/tests/latex-reader.latex
index 883217c86..fa2d49294 100644
--- a/tests/latex-reader.latex
+++ b/tests/latex-reader.latex
@@ -5,7 +5,7 @@
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 
 \newcommand{\textsubscript}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}
-\usepackage[breaklinks=true]{hyperref}
+\usepackage[breaklinks=true,unicode=true]{hyperref}
 \usepackage[normalem]{ulem}
 \usepackage{enumerate}
 \usepackage{fancyvrb}
diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
index c3ef9bcf5..ee078546b 100644
--- a/tests/lhs-test.latex
+++ b/tests/lhs-test.latex
@@ -2,6 +2,7 @@
 \usepackage{amsmath}
 \usepackage[mathletters]{ucs}
 \usepackage[utf8x]{inputenc}
+\usepackage[breaklinks=true,unicode=true]{hyperref}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setcounter{secnumdepth}{0}
diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs
index 2f1403d6d..e4041a3af 100644
--- a/tests/lhs-test.latex+lhs
+++ b/tests/lhs-test.latex+lhs
@@ -4,6 +4,7 @@
 \usepackage[utf8x]{inputenc}
 \usepackage{listings}
 \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
+\usepackage[breaklinks=true,unicode=true]{hyperref}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setcounter{secnumdepth}{0}
diff --git a/tests/writer.latex b/tests/writer.latex
index 5b9c08126..dcbca54e7 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -2,15 +2,15 @@
 \usepackage{amsmath}
 \usepackage[mathletters]{ucs}
 \usepackage[utf8x]{inputenc}
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{6pt plus 2pt minus 1pt}
 \usepackage{fancyvrb}
 \usepackage{enumerate}
 \usepackage[normalem]{ulem}
 \newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}}
-\usepackage[breaklinks=true]{hyperref}
 \usepackage{url}
 \usepackage{graphicx}
+\usepackage[breaklinks=true,unicode=true]{hyperref}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{6pt plus 2pt minus 1pt}
 \setcounter{secnumdepth}{0}
 \VerbatimFootnotes % allows verbatim text in footnotes