diff --git a/src/etc/testcases/types/scriptcondition.xml b/src/etc/testcases/types/scriptcondition.xml
deleted file mode 100644
index f1b6770d0..000000000
--- a/src/etc/testcases/types/scriptcondition.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self.setValue(true);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self.setValue(true);
-
-
-
-
-
-
-
- self.setValue(false);
-
-
-
-
diff --git a/src/tests/antunit/types/scriptcondition-test.xml b/src/tests/antunit/types/scriptcondition-test.xml
new file mode 100644
index 000000000..abbe13441
--- /dev/null
+++ b/src/tests/antunit/types/scriptcondition-test.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ self.setValue(true);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ self.setValue(true);
+
+
+
+
+
+
+
+ self.setValue(false);
+
+
+
+
diff --git a/src/tests/junit/org/apache/tools/ant/types/optional/ScriptConditionTest.java b/src/tests/junit/org/apache/tools/ant/types/optional/ScriptConditionTest.java
deleted file mode 100644
index e4d160d37..000000000
--- a/src/tests/junit/org/apache/tools/ant/types/optional/ScriptConditionTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.apache.tools.ant.types.optional;
-
-import org.apache.tools.ant.BuildFileTest;
-
-/**
- */
-public class ScriptConditionTest extends BuildFileTest {
- /**
- * Constructor for the BuildFileTest object
- *
- * @param name string to pass up to TestCase constructor
- */
- public ScriptConditionTest(String name) {
- super(name);
- }
-
- public void setUp() {
- configureProject("src/etc/testcases/types/scriptcondition.xml");
- }
-
- public void testNolanguage() {
- expectBuildExceptionContaining("testNolanguage",
- "Absence of language attribute not detected",
- "script language must be specified");
- }
-
- public void testMacro() {
- executeTarget("testMacro");
- }
- public void testClearByDefault() {
- executeTarget("testClearByDefault");
- }
- public void testValueWorks() {
- executeTarget("testValueWorks");
- }
-
- public void testSetWorks() {
- executeTarget("testSetWorks");
- }
-
- public void testClearWorks() {
- executeTarget("testClearWorks");
- }
-
-}