diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 5144475e..ac6e4589 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
 
@@ -692,6 +692,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..88a9cc8c
--- /dev/null
+++ b/test/fixtures/hello_syntax1.opa
@@ -0,0 +1,9 @@
+/**
+ * To compile & run on port 8080:
+ * opa hello_syntax1.opa --
+ */
+server = Server.one_page_server(
+   "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..14c0c93f
--- /dev/null
+++ b/test/fixtures/hello_syntax2.opa
@@ -0,0 +1,11 @@
+/**
+ * To compile & run on port 8080:
+ * opa --parser js-like hello_syntax2.opa --
+ */
+Server.start(
+   Server.http,
+   {
+     page: function() { <h1>Hello, world</h1> },
+     title: "Hello, world"
+   }
+)