diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index a56545e6..655aefd4 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -342,7 +342,7 @@ Fancy:
 
 Fantom:
   type: programming
-  lexer: Java 
+  lexer: Java
   extensions:
   - .fan
 
@@ -691,6 +691,11 @@ Objective-J:
   - .j
   - .sj
 
+Opa:
+  type: programming
+  extensions:
+  - .opa
+
 OpenCL:
   type: programming
   group: C
diff --git a/test/fixtures/hello_syntax1.opa b/test/fixtures/hello_syntax1.opa
new file mode 100644
index 00000000..dcfcc4ed
--- /dev/null
+++ b/test/fixtures/hello_syntax1.opa
@@ -0,0 +1,5 @@
+server = Server.one_page_bundle("Hello World",
+       [],
+       [],
+       _ -> <h1>Hello, world</h1>)
+
diff --git a/test/fixtures/hello_syntax2.opa b/test/fixtures/hello_syntax2.opa
new file mode 100644
index 00000000..aea48e82
--- /dev/null
+++ b/test/fixtures/hello_syntax2.opa
@@ -0,0 +1,7 @@
+Server.start(
+   Server.http,
+   {
+     page: function() { <h1>Hello, world</h1> },
+     title: "Hello, world"
+   }
+)