diff --git a/core/src/test/java/org/elasticsearch/script/ScriptTests.java b/core/src/test/java/org/elasticsearch/script/ScriptTests.java
new file mode 100644
index 00000000000..316a1c8451b
--- /dev/null
+++ b/core/src/test/java/org/elasticsearch/script/ScriptTests.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.script;
+
+import org.elasticsearch.common.ParseFieldMatcher;
+import org.elasticsearch.common.io.stream.InputStreamStreamInput;
+import org.elasticsearch.common.io.stream.OutputStreamStreamOutput;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.test.ESTestCase;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+import static org.hamcrest.Matchers.equalTo;
+
+public class ScriptTests extends ESTestCase {
+
+    public void testScriptParsing() throws IOException {
+        XContent xContent = randomFrom(XContentType.JSON, XContentType.YAML).xContent();
+        Script expectedScript = createScript(xContent);
+        try (XContentBuilder builder = XContentBuilder.builder(xContent)) {
+            expectedScript.toXContent(builder, ToXContent.EMPTY_PARAMS);
+            try (XContentParser parser = XContentHelper.createParser(builder.bytes())) {
+                Script actualScript = Script.parse(parser, ParseFieldMatcher.STRICT);
+                assertThat(actualScript, equalTo(expectedScript));
+            }
+        }
+    }
+
+    public void testScriptSerialization() throws IOException {
+        XContent xContent = randomFrom(XContentType.JSON, XContentType.YAML).xContent();
+        Script expectedScript = createScript(xContent);
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            expectedScript.writeTo(new OutputStreamStreamOutput(out));
+            try (ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) {
+                Script actualScript = new Script(new InputStreamStreamInput(in));
+                assertThat(actualScript, equalTo(expectedScript));
+            }
+        }
+    }
+
+    private Script createScript(XContent xContent) throws IOException {
+        final Map<String, Object> params = randomBoolean() ? null : Collections.singletonMap("key", "value");
+        ScriptService.ScriptType scriptType = randomFrom(ScriptService.ScriptType.values());
+        String script;
+        if (scriptType == ScriptService.ScriptType.INLINE) {
+            try (XContentBuilder builder = XContentBuilder.builder(xContent)) {
+                builder.startObject();
+                builder.field("field", randomAsciiOfLengthBetween(1, 5));
+                builder.endObject();
+                script = builder.string();
+            }
+        } else {
+            script = randomAsciiOfLengthBetween(1, 5);
+        }
+        return new Script(
+                script,
+                scriptType,
+                randomFrom("_lang1", "_lang2", null),
+                params,
+                scriptType == ScriptService.ScriptType.INLINE ? xContent.type() : null
+        );
+    }
+
+
+}