diff --git a/test/Transforms/GlobalOpt/basictest.llx b/test/Transforms/GlobalOpt/basictest.llx
new file mode 100644
index 00000000000..46fac76433b
--- /dev/null
+++ b/test/Transforms/GlobalOpt/basictest.llx
@@ -0,0 +1,9 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global
+
+%X = internal global int 4
+
+
+int %foo() {
+	%V = load int* %X
+	ret int %V
+}
diff --git a/test/Transforms/GlobalOpt/deadglobal.llx b/test/Transforms/GlobalOpt/deadglobal.llx
new file mode 100644
index 00000000000..c0819c0c648
--- /dev/null
+++ b/test/Transforms/GlobalOpt/deadglobal.llx
@@ -0,0 +1,8 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep internal
+
+%G = internal global int 123
+
+void %foo() {
+	store int 1, int* %G
+	ret void
+}
diff --git a/test/Transforms/GlobalOpt/phi-select.llx b/test/Transforms/GlobalOpt/phi-select.llx
new file mode 100644
index 00000000000..29890600def
--- /dev/null
+++ b/test/Transforms/GlobalOpt/phi-select.llx
@@ -0,0 +1,29 @@
+; Test that PHI nodes and select instructions do not necessarily make stuff
+; non-constant.
+
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global
+
+%X = internal global int 4
+%Y = internal global int 5
+
+int %test1(bool %C) {
+	%P = select bool %C, int* %X, int* %Y
+	%V = load int* %P
+	ret int %V
+}
+
+
+int %test2(bool %C) {
+	br bool %C, label %T, label %Cont
+T:
+	br label %Cont
+Cont:
+	%P = phi int* [%X, %0], [%Y, %T]
+	%V = load int* %P
+	ret int %V
+}
+
+
+
+
+
diff --git a/test/Transforms/GlobalOpt/trivialstore.llx b/test/Transforms/GlobalOpt/trivialstore.llx
new file mode 100644
index 00000000000..af2d61287c2
--- /dev/null
+++ b/test/Transforms/GlobalOpt/trivialstore.llx
@@ -0,0 +1,17 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep G
+
+%G = internal global int 17
+
+void %foo() {
+	store int 17, int* %G   ;; Doesn't change the value
+	ret void
+}
+int %bar() {
+	%X = load int* %G
+	ret int %X
+}
+
+internal void %dead() {
+	store int 123, int* %G
+	ret void
+}