diff --git a/exercises/practice/eliuds-eggs/.meta/generator.tpl b/exercises/practice/eliuds-eggs/.meta/generator.tpl
new file mode 100644
index 000000000..fbd4f24d5
--- /dev/null
+++ b/exercises/practice/eliuds-eggs/.meta/generator.tpl
@@ -0,0 +1,9 @@
+(ns eliuds-eggs-test
+  (:require [clojure.test :refer [deftest testing is]]
+            eliuds-eggs))
+
+{{#test_cases.eggCount}}
+(deftest egg-count_test_{{idx}}
+  (testing {{description}}
+    (is (= {{expected}} (eliuds-eggs/egg-count {{input.number}})))))
+{{/test_cases.eggCount}}
diff --git a/exercises/practice/eliuds-eggs/src/eliuds_eggs.clj b/exercises/practice/eliuds-eggs/src/eliuds_eggs.clj
index 1ade79a35..58b54c36c 100644
--- a/exercises/practice/eliuds-eggs/src/eliuds_eggs.clj
+++ b/exercises/practice/eliuds-eggs/src/eliuds_eggs.clj
@@ -1,5 +1,7 @@
 (ns eliuds-eggs)
 
-(defn egg-count [number]
-    ;; your code goes here
-)
\ No newline at end of file
+(defn egg-count
+  "Returns the number of 1 bits in the binary representation of the given number."
+  [number]
+  ;; function body
+  )
diff --git a/exercises/practice/eliuds-eggs/test/eliuds_eggs_test.clj b/exercises/practice/eliuds-eggs/test/eliuds_eggs_test.clj
index e660f1868..a0d8ea0e9 100644
--- a/exercises/practice/eliuds-eggs/test/eliuds_eggs_test.clj
+++ b/exercises/practice/eliuds-eggs/test/eliuds_eggs_test.clj
@@ -1,15 +1,19 @@
 (ns eliuds-eggs-test
-  (:require [clojure.test :refer [deftest is]]
+  (:require [clojure.test :refer [deftest testing is]]
             eliuds-eggs))
 
-(deftest no-eggs
-  (is (= 0 (eliuds-eggs/egg-count 0))))
+(deftest egg-count_test_1
+  (testing "0 eggs"
+    (is (= 0 (eliuds-eggs/egg-count 0)))))
 
-(deftest one-egg
-  (is (= 1 (eliuds-eggs/egg-count 16))))
+(deftest egg-count_test_2
+  (testing "1 egg"
+    (is (= 1 (eliuds-eggs/egg-count 16)))))
 
-(deftest four-eggs
-  (is (= 4 (eliuds-eggs/egg-count 89))))
+(deftest egg-count_test_3
+  (testing "4 eggs"
+    (is (= 4 (eliuds-eggs/egg-count 89)))))
 
-(deftest thirteen-eggs
-  (is (= 13 (eliuds-eggs/egg-count 2000000000))))
\ No newline at end of file
+(deftest egg-count_test_4
+  (testing "13 eggs"
+    (is (= 13 (eliuds-eggs/egg-count 2000000000)))))